From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932087AbbKBOeB (ORCPT ); Mon, 2 Nov 2015 09:34:01 -0500 Received: from smtprelay0109.hostedemail.com ([216.40.44.109]:51641 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753601AbbKBOd7 (ORCPT ); Mon, 2 Nov 2015 09:33:59 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::,RULES_HIT:41:355:379:541:599:800:877:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1537:1566:1593:1594:1711:1714:1730:1747:1777:1792:2393:2553:2559:2562:2693:3138:3139:3140:3141:3142:3622:3865:3867:3870:3872:3874:5007:6261:7875:10004:10400:10848:10967:11232:11658:11914:12517:12519:12740:13069:13311:13357:13618:21080:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: veil98_79a00b0e16904 X-Filterd-Recvd-Size: 1393 Date: Mon, 2 Nov 2015 09:33:54 -0500 From: Steven Rostedt 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 Subject: Re: linux-next: Tree for Nov 2 Message-ID: <20151102093354.3fd39d56@gandalf.local.home> In-Reply-To: <20151102173023.52237c7f@canb.auug.org.au> References: <20151102154017.6817486c@canb.auug.org.au> <20151102055816.GA434@swordfish> <20151102173023.52237c7f@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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