From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752104AbbFXIup (ORCPT ); Wed, 24 Jun 2015 04:50:45 -0400 Received: from www.linutronix.de ([62.245.132.108]:43709 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750916AbbFXIul (ORCPT ); Wed, 24 Jun 2015 04:50:41 -0400 Date: Wed, 24 Jun 2015 10:50:38 +0200 (CEST) From: Thomas Gleixner To: Ingo Molnar cc: Borislav Petkov , Linus Torvalds , linux-edac , x86-ml , lkml Subject: Re: [GIT PULL] EDAC updates for 4.2 In-Reply-To: <20150624082306.GB23842@gmail.com> Message-ID: References: <20150622091140.GA20244@pd.tnic> <20150624074029.GA32642@pd.tnic> <20150624082306.GB23842@gmail.com> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 24 Jun 2015, Ingo Molnar wrote: > * Borislav Petkov wrote: > > > > If it doesn't work or compile without the tip pile, then I'm not pulling it at > > > all, since that means that any problems are not bisectable. > > > > Ok, how would you prefer this solved - should I merge the relevant tip branches > > into it? > > So the broken commit is 1862c7c3483c. Given that only a handful of commits follow > it, I'd suggest the following resolution, to preserve half of your tree: > > git checkout -b tmp.tmp your/edac/tree > git reset --hard 1862c7c3483c^1 > git merge linus # where 'linus' is 407a2c720556e - your DEFERRED_ERROR_VECTOR dependency > git checkout -b tmp.tmp2 your/edac/tree > git rebase --onto tmp.tmp 1862c7c3483c^1 > > Then re-test and re-submit the result to Linus as -v2. > > Note that 407a2c720556e is very early in the v4.2 merge window, with only -tip > (and some VFS) bits in it, which I have tested and which is looking pretty robust. > > In the future we can do such dependencies in -tip as well, so that they don't > reach Linus - I didn't realize your tree had this dependency. One of the solution I use for cross tree dependencies is: - Apply the commits which create a dependency to a seperate branch - Let the depending tree pull that branch - Merge the branch into the proper tip/ branch Thanks, tglx