lkml.org 
[lkml]   [2009]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the trivial tree with the net-current tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 10 Dec 2009 22:14:06 +1100

> Hi Jiri,
>
> On Thu, 10 Dec 2009 09:45:27 +0100 (CET) Jiri Kosina <jkosina@suse.cz> 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.


\
 
 \ /
  Last update: 2009-12-10 23:43    [W:0.044 / U:1.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site