lkml.org 
[lkml]   [2010]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the net tree
Hi Dave,

On Tue, 11 May 2010 23:13:39 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Tricky merge :-)

Yeah, I got it right the second time :-)

> I'll clear all of these issues up for you tonight Stephen, thanks!

Thanks.

> There should have been a merge conflict in
> Documentation/feature-removal-schedule.txt due to some recent
> netfilter commits too, I'll take care of that too of course :)

Yeah, but I have stopped reporting those when they are just clashes
between people adding new entries at the end.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-05-12 09:53    [W:0.031 / U:5.628 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site