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 for Android: free password hash cracker in your pocket

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

Message-Id: <20080305185730.fa4389a5.sfr@canb.auug.org.au>
Date:	Wed, 5 Mar 2008 18:57:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Stefan Richter <stefanr@...6.in-berlin.de>
Cc:	Sam Ravnborg <sam@...nborg.org>, linux-next@...r.kernel.org,
	LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for March 4

Hi Stefan, Sam,

On Tue, 04 Mar 2008 22:01:47 +0100 Stefan Richter <stefanr@...6.in-berlin.de> wrote:
>
> 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.)

I can live with it for a while.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped