linux-kernel - Re: linux-next: Tree for March 4

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <47CDB8BB.9020909@s5r6.in-berlin.de>
Date:	Tue, 04 Mar 2008 22:01:47 +0100
From:	Stefan Richter <stefanr@...6.in-berlin.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Sam Ravnborg <sam@...nborg.org>
CC:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: 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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/