From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752035Ab1GUJdi (ORCPT <rfc822;w@1wt.eu>);
	Thu, 21 Jul 2011 05:33:38 -0400
Received: from ozlabs.org ([203.10.76.45]:33641 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751421Ab1GUJdc (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 21 Jul 2011 05:33:32 -0400
From: Rusty Russell <rusty@rustcorp.com.au>
To: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Greg Ungerer <gerg@snapgear.com>,
        Jonas Bonn <jonas@southpole.se>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Greg Ungerer <gerg@uclinux.org>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: linux-next: manual merge of the rr tree with the  tree
In-Reply-To: <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> <4E256A2E.50607@cam.ac.uk>
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1 (i686-pc-linux-gnu)
Date: Thu, 21 Jul 2011 17:25:45 +0930
Message-ID: <8739i02hku.fsf@rustcorp.com.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, 19 Jul 2011 12:27:42 +0100, Jonathan Cameron <jic23@cam.ac.uk> wrote:
> On 07/07/11 02:07, Rusty Russell wrote:
> > On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >> Hi all,
> > .... 
> >>> Acked-by: Greg Ungerer <gerg@uclinux.org>
> >>
> >> 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.

It's trivial code... just please send to Linus first day of merge
window, and when I rebase I'll fix this up.

Thanks,
Rusty.