lkml.org 
[lkml]   [2008]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for March 4
Stephen Rothwell wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> There were three minor merge problems.

One of them is tests.git's lib/Kconfig.debug. linux1394-2.6.git's
commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one
causing it.

Stephen, should one of me and Sam adjust his -next branch? (This kind
of conflict will be trivially avoided in the merge window; so resolving
it now would mainly mean one manual(?) step less for Stephen.)
--
Stefan Richter
-=====-==--- --== --=--
http://arcgraph.de/sr/


\
 
 \ /
  Last update: 2008-03-04 22:05    [W:0.057 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site