Re: [GIT PULL] EDAC updates for 4.2

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Ingo Molnar <mingo@kernel.org>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] EDAC updates for 4.2
Date	Wed, 24 Jun 2015 10:30:03 +0200
Message-ID	<pEOef-4ou-25@gated-at.bofh.it> (permalink)
References	<pE63w-7OF-17@gated-at.bofh.it> <pEFkC-8ie-7@gated-at.bofh.it> <pENBw-3q6-11@gated-at.bofh.it>
X-Original-To	Borislav Petkov <bp@suse.de>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=AlXF1X9Z6nwdx7qV+lXOLCeKqmU6ywUdMv1B3xn7i+4=; b=V0C8nQlKZY/dXW2lls0PMjVJxWPYy7Pl5vWMYaPFUgmXhLrY84OvXDSWXonO2PxIn6 dChSjC7ndx/YYpz85UY3xi7kSUhs9/UpwZIesci3olcLdunTBrVkdCKnKGTxWlWy2kot TGejYQicaYEsDWucoRTU5lbHSusxTMpJdoThf4yYHBStoKWo951GkQPbYerVtebTQki3 kMSm3uH1Av8L42hKaRe7B0TK9p4Zb9PTuYavx88dsjF+Qs37lKVIW3pQCv7nARvI79wb RvcwPexZaJrDD+ukBda2EPk+Ec0BEcVYTrdJGRbxYX5LNZNWqH7nInG89roQ8qsF8SfL yT8w==
X-Received	by 10.180.96.170 with SMTP id dt10mr2666324wib.42.1435134190442; Wed, 24 Jun 2015 01:23:10 -0700 (PDT)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.5.23 (2014-03-12)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	34
Organization	linux.* mail to news gateway
X-Original-Cc	Linus Torvalds <torvalds@linux-foundation.org>, linux-edac <linux-edac@vger.kernel.org>, x86-ml <x86@kernel.org>, lkml <linux-kernel@vger.kernel.org>
X-Original-Date	Wed, 24 Jun 2015 10:23:07 +0200
X-Original-Message-ID	<20150624082306.GB23842@gmail.com>
X-Original-References	<20150622091140.GA20244@pd.tnic> <CA+55aFzYzQKy70UGJ7qQj_T9BqjaLPa57dv_-2db-XpGCys79w@mail.gmail.com> <20150624074029.GA32642@pd.tnic>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	aioe.org linux.kernel:1171174

Show key headers only | View raw

* Borislav Petkov <bp@suse.de> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

Re: [GIT PULL] EDAC updates for 4.2 Borislav Petkov <bp@suse.de> - 2015-06-24 09:50 +0200
  Re: [GIT PULL] EDAC updates for 4.2 Ingo Molnar <mingo@kernel.org> - 2015-06-24 10:30 +0200
    Re: [GIT PULL] EDAC updates for 4.2 Borislav Petkov <bp@suse.de> - 2015-06-24 11:00 +0200
    Re: [GIT PULL] EDAC updates for 4.2 Thomas Gleixner <tglx@linutronix.de> - 2015-06-24 11:00 +0200

csiph-web