Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Sender: Tejun Heo <htejun@gmail.com>
Date:   Mon, 10 Oct 2022 10:59:47 -1000
From:   Tejun Heo <tj@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Chengming Zhou <zhouchengming@bytedance.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the cgroup tree
Message-ID: <Y0SHw8VaKkcEKaT7@slm.duckdns.org>
References: <20220912161812.072aaa3b@canb.auug.org.au>
 <20221011075748.3db42926@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221011075748.3db42926@canb.auug.org.au>
Precedence: bulk

On Tue, Oct 11, 2022 at 07:57:48AM +1100, Stephen Rothwell wrote:
> This is now a conflict between the tip tree and Linus' tree.

The conflict and resolution were noted in the pull request. This should be
fine.

Thanks.

-- 
tejun