From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbbFXIXU (ORCPT ); Wed, 24 Jun 2015 04:23:20 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:35229 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbbFXIXL (ORCPT ); Wed, 24 Jun 2015 04:23:11 -0400 Date: Wed, 24 Jun 2015 10:23:07 +0200 From: Ingo Molnar To: Borislav Petkov Cc: Linus Torvalds , linux-edac , x86-ml , lkml Subject: Re: [GIT PULL] EDAC updates for 4.2 Message-ID: <20150624082306.GB23842@gmail.com> References: <20150622091140.GA20244@pd.tnic> <20150624074029.GA32642@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150624074029.GA32642@pd.tnic> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * 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. Thanks, Ingo