linux-kernel - Re: linux-next: Tree for July 20

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: <20110720234817.fdc50eadf3ae775e89642689@canb.auug.org.au>
Date:	Wed, 20 Jul 2011 23:48:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for July 20

Hi Mark,

On Wed, 20 Jul 2011 14:02:21 +0100 Mark Brown <broonie@...nsource.wolfsonmicro.com> wrote:
>
> On Wed, Jul 20, 2011 at 06:00:41PM +1000, Stephen Rothwell wrote:
> 
> > The regmap tree lost its conflict.
> 
> What was the conflict, OOI?  I didn't notice anything.

It was just a simple conflict against the spi tree in
drivers/spi/Makefile that I probably didn't even report.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped