From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree Date: Wed, 21 Jan 2015 06:34:10 +0100 Message-ID: <20150121053410.GA15291@gmail.com> References: <20150119170839.2c6b4b78@canb.auug.org.au> <20150119093501.GA4644@pd.tnic> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mail-wg0-f51.google.com ([74.125.82.51]:37533 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750735AbbAUFeP (ORCPT ); Wed, 21 Jan 2015 00:34:15 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Andy Lutomirski Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , Tony Luck , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Stephen Rothwell * 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. Thanks, Ingo