Subject: Re: linux-next: manual merge of the rr tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 14 Nov 2008 15:36:25 +1100

Hi Dave,

On Thu, 13 Nov 2008 20:30:59 -0800 (PST) David Miller <[email-masked]> wrote:
>
> I'm open to just about anything that doesn't involve
> rebasing my tree :)

The only issue would be if you have patches to remove/rename the netdev
priv field - they would have to be delayed until after Rusty's tree was
merged, or someone could submit a trivial patch to Linus to do that last
netdev_priv() conversion in virtio_net.c and you could both rebase/merge
that.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/