From mboxrd@z Thu Jan 1 00:00:00 1970 From: "H. Peter Anvin" Subject: Re: linux-next: manual merge of the tip tree with Linus' tree Date: Tue, 20 May 2014 23:02:01 -0700 Message-ID: <31a51237-ff54-4beb-b905-60ed8f13b5fb@email.android.com> References: <20140521141249.6f87b7e7@canb.auug.org.au> <537C2A72.9030503@zytor.com> <20140521060100.GA5484@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from terminus.zytor.com ([198.137.202.10]:60689 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbaEUGDK (ORCPT ); Wed, 21 May 2014 02:03:10 -0400 In-Reply-To: <20140521060100.GA5484@gmail.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Ingo Molnar Cc: Stephen Rothwell , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Ok. Will do. On May 20, 2014 11:01:00 PM PDT, Ingo Molnar wrote: > >* H. Peter Anvin wrote: > >> On 05/20/2014 09:12 PM, Stephen Rothwell wrote: >> > Hi all, >> > >> > Today's linux-next merge of the tip tree got a conflict in >> > arch/x86/kernel/ldt.c between commit fa81511bb0bb ("x86-64, >> > modify_ldt: Make support for 16-bit segments a runtime option") >> > from Linus' tree and commit 34273f41d57e ("x86, espfix: Make it >> > possible to disable 16-bit support") from the tip tree. >> > >> > I fixed it up (see below) and can carry the fix as necessary (no >> > action is required). >> > >> >> This (and the previous one) is not the correct fix, although it will >> work. The correct fix is instead to completely revert fa81511bb0bb >> before merging in tip:x86/espfix. >> >> Sorry for the inconvenience. Linus generally doesn't like it when we >> fix up merges for him, or I'd set up a "clean" tip:x86/espfix branch. > >Please merge x86/urgent into x86/vdso while memories are still fresh - >fixing up conflicts between our own branches is entirely fine (I'm >doing it all the time to help the development flow) and it will make >life easier. > >What Linus dislikes most are merges between completely _unrelated_ >topic branches, especially if they cross maintenance domains. > >Thanks, > > Ingo -- Sent from my mobile phone. Please pardon brevity and lack of formatting.