From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Date: Fri, 12 Oct 2018 12:47:44 +0200 Message-ID: <20181012104744.GA105548@gmail.com> References: <20181012131444.605564b5@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Kees Cook Cc: Ingo Molnar , Stephen Rothwell , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra , Linux-Next Mailing List , Linux Kernel Mailing List , Arnd Bergmann List-Id: linux-next.vger.kernel.org * Kees Cook wrote: > On Thu, Oct 11, 2018 at 7:14 PM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > arch/x86/mm/pgtable.c > > > > between commit: > > > > 184d47f0fd36 ("x86/mm: Avoid VLA in pgd_alloc()") > > > > from Linus' tree and commit: > > > > 1be3f247c288 ("x86/mm: Avoid VLA in pgd_alloc()") > > > > from the tip tree. > > > > I fixed it up (I used the version from Linus' tree) and can carry the > > fix as necessary. This is now fixed as far as linux-next is concerned, > > but any non trivial conflicts should be mentioned to your upstream > > maintainer when your tree is submitted for merging. You may also want > > to consider cooperating with the maintainer of the conflicting tree to > > minimise any particularly complex conflicts. This is the correct resolution, thanks Stephen! > Ingo, it looks like that commit needs to be split up again ... Linus's > tree still needs the fix for the fix? -next still had the old commit, I've now refreshed tip:auto-latest so the conflict should go away in the next iteration. Linus's tree has the correct fix. Thanks, Ingo