From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Cameron Subject: Re: linux-next: manual merge of the rr tree with the tree Date: Tue, 19 Jul 2011 12:27:42 +0100 Message-ID: <4E256A2E.50607@cam.ac.uk> References: <20110705135932.de7f0526.sfr@canb.auug.org.au> <1309967847.3393.44.camel@jerome> <4E14F373.1020307@snapgear.com> <20110707102432.5a779744e247652be005b592@canb.auug.org.au> <87liwakiez.fsf@rustcorp.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from ppsw-41.csi.cam.ac.uk ([131.111.8.141]:39610 "EHLO ppsw-41.csi.cam.ac.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032Ab1GSL1v (ORCPT ); Tue, 19 Jul 2011 07:27:51 -0400 In-Reply-To: <87liwakiez.fsf@rustcorp.com.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Rusty Russell Cc: Stephen Rothwell , Greg Ungerer , Jonas Bonn , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Ungerer , Geert Uytterhoeven On 07/07/11 02:07, Rusty Russell wrote: > On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell wrote: >> Hi all, > .... >>> Acked-by: Greg Ungerer >> >> OK, so now someone just has to remember to apply it (or tell Linus, or >> fix up the trees) during the merge window. That person probably won't >> be me (since I will not be online next week (assuming Linus follows >> through and opens the merge window next week). > > I'm travelling next week too, so m68k will probably get merged first, > and hence I'll roll in this fix myself. > > Thanks, > Rusty. Rusty? If not I'm happy to take on adapting this to meet everyone's requirements. Jonathan