Hi Stefan, Sam,

On Tue, 04 Mar 2008 22:01:47 +0100 Stefan Richter <stefanr@s5r6.in-berlin.d=
e> wrote:
quoted text
>
> One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's=20
> commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one=20
> causing it.
>=20
> Stephen, should one of me and Sam adjust his -next branch?  (This kind=20
> of conflict will be trivially avoided in the merge window; so resolving=20
> it now would mainly mean one manual(?) step less for Stephen.)

I can live with it for a while.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au