From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750854AbbAUFtA (ORCPT ); Wed, 21 Jan 2015 00:49:00 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:53670 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750754AbbAUFs7 (ORCPT ); Wed, 21 Jan 2015 00:48:59 -0500 MIME-Version: 1.0 In-Reply-To: <20150121053410.GA15291@gmail.com> References: <20150119170839.2c6b4b78@canb.auug.org.au> <20150119093501.GA4644@pd.tnic> <20150121053410.GA15291@gmail.com> From: Andy Lutomirski Date: Tue, 20 Jan 2015 21:48:36 -0800 Message-ID: Subject: Re: Fwd: linux-next: manual merge of the luto-misc tree with the tip tree To: Ingo Molnar Cc: Ingo Molnar , Thomas Gleixner , Borislav Petkov , Tony Luck , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Stephen Rothwell Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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? --Andy