Re: linux-next: Tree for March 4

[Stefan Richter]

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/
--
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/