Re: linux-next: manual merge of the trivial tree with thenet-current tree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 10 Dec 2009 22:14:06 +1100

> Hi Jiri,
> 
> On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@xxxxxxx> wrote:
>>
>> Linus has merged trivial tree into his tree tonight, so I am afraid that 
>> davem will have to fix the conflict when pulling Linus tree into 
>> net-current.
> 
> Yep, or Linus can fix it if he feels inclined.

Nah, I'll do a pull into net-2.6 to resolve the conflict first.
--
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/