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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 11 Nov 2008 19:24:53 +1100

Hi David,

On Mon, 10 Nov 2008 23:00:49 -0800 (PST) David Miller <[email-masked]> wrote:
>
> Thanks for the heads up.  There will be even more conflicts,
> between net-2.6 and net-next-2.6, that will need resolving
> as well.

Is there some reason that you can't merge net-next-2.6 into net-2.6 when
these conflicts arise?

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