linux-kernel - Re: linux-next: manual merge of the tip tree with Linus' tree

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] [day] [month] [year] [list]

Message-Id: <20100118195904.07c77596.sfr@canb.auug.org.au>
Date:	Mon, 18 Jan 2010 19:59:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jan Kiszka <jan.kiszka@...mens.com>,
	Steven Rostedt <rostedt@...dmis.org>,
	Wolfram Sang <w.sang@...gutronix.de>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree

Hi Ingo,

On Mon, 18 Jan 2010 08:50:25 +0100 Ingo Molnar <mingo@...e.hu> wrote:
>
> FYI, i resolved the conflict already in tip:master yesterday, a bit 
> differently.

Excellent, thanks.

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

Content of type "application/pgp-signature" skipped