From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023Ab1GSL1w (ORCPT ); Tue, 19 Jul 2011 07:27:52 -0400 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 X-Cam-AntiVirus: no malware found X-Cam-SpamDetails: not scanned X-Cam-ScannerInfo: http://www.cam.ac.uk/cs/email/scanner/ Message-ID: <4E256A2E.50607@cam.ac.uk> Date: Tue, 19 Jul 2011 12:27:42 +0100 From: Jonathan Cameron User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110509 Lightning/1.0b3pre Thunderbird/3.1.10 MIME-Version: 1.0 Newsgroups: gmane.linux.kernel.next,gmane.linux.kernel To: Rusty Russell CC: Stephen Rothwell , Greg Ungerer , Jonas Bonn , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Ungerer , Geert Uytterhoeven Subject: Re: linux-next: manual merge of the rr tree with the tree 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> In-Reply-To: <87liwakiez.fsf@rustcorp.com.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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