From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: Re: linux-next: Tree for Nov 2 Date: Mon, 2 Nov 2015 09:33:54 -0500 Message-ID: <20151102093354.3fd39d56@gandalf.local.home> References: <20151102154017.6817486c@canb.auug.org.au> <20151102055816.GA434@swordfish> <20151102173023.52237c7f@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20151102173023.52237c7f@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Sergey Senozhatsky , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra List-Id: linux-next.vger.kernel.org On Mon, 2 Nov 2015 17:30:23 +1100 Stephen Rothwell wrote: > So I guess I need that (or something similar) in linux-next until these > trees are merged. > Yeah, the fixup looks fine to me. It will be something that Linus will need to do himself when he hits the conflict too. -- Steve