linux-kernel - Re: linux-next: Tree for December 3

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]

Date:	Fri, 4 Dec 2009 01:13:24 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for December 3

Hi Jiri,

On Thu, 3 Dec 2009 14:37:06 +0100 (CET) Jiri Kosina <jkosina@...e.cz> wrote:
>
> > Merging trivial/for-next
> > CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.txt
> 
> have you been sending out e-mail about this conflict? I don't seem to have 
> received any.

No, I didn't because it is very simple and was only in a documentation
file.  I figured it would be cleared up easily if/when it comes up in
being merged into Linus' tree (or maybe before if it is noticed).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped