Re: linux-next: manual merge of the rr tree with the tree
From: Rusty Russell
Date: Thu Jul 21 2011 - 05:33:57 EST
On Tue, 19 Jul 2011 12:27:42 +0100, Jonathan Cameron <jic23@xxxxxxxxx> wrote:
> On 07/07/11 02:07, Rusty Russell wrote:
> > On Thu, 7 Jul 2011 10:24:32 +1000, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >> Hi all,
> > ....
> >>> Acked-by: Greg Ungerer <gerg@xxxxxxxxxxx>
> >> 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.
> 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.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/