From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152AbbAUGCr (ORCPT ); Wed, 21 Jan 2015 01:02:47 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:60744 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750947AbbAUGCp (ORCPT ); Wed, 21 Jan 2015 01:02:45 -0500 Date: Wed, 21 Jan 2015 06:55:32 +0100 From: Ingo Molnar To: Andy Lutomirski Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , Tony Luck , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Stephen Rothwell Subject: Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree Message-ID: <20150121055532.GA15518@gmail.com> References: <20150119170839.2c6b4b78@canb.auug.org.au> <20150119093501.GA4644@pd.tnic> <20150121053410.GA15291@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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 * Andy Lutomirski wrote: > On Tue, Jan 20, 2015 at 9:34 PM, Ingo Molnar wrote: > > > > * Andy Lutomirski wrote: > > > >> Hi Ingo and Thomas- > >> > >> There's a trivial conflict in the pull request I sent last week. > > > > This is your x86 entry code rework pull request, right? The -tip > > tree now has the RCU commit it depends on, so could you please > > rebase it on top of tip:core/rcu so I can pull it? I'll resolve > > any remaining conflicts with the rest of -tip. > > > > Sure, I can do that in the morning. The pull request merges cleanly > with tip:core/rcu, though, so is the rebase needed? Yes, because your changes rely on the RCU change (semantically), so if anyone bisects into your commits it might result in a subtly broken kernel, right? Thanks, Ingo