linux-kernel - Re: linux-next: Tree for December 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: <20091204214416.76231945.sfr@canb.auug.org.au>
Date:	Fri, 4 Dec 2009 21:44:16 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	michal.simek@...alogix.com
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for December 4

Hi Michal,

On Fri, 04 Dec 2009 10:44:28 +0100 Michal Simek <michal.simek@...alogix.com> wrote:
>
>  > Merging microblaze/next
>  > CONFLICT (content): Merge conflict in drivers/serial/of_serial.c
> 
> I removed that my first patch from my next branch - it is in tty tree.

Thanks.

It is actually in Linus' tree now.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped