linux-kernel - Re: linux-next: manual merge of the trivial tree with the omap 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: <20101213222307.64c6510e.sfr@canb.auug.org.au>
Date:	Mon, 13 Dec 2010 22:23:07 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kevin Hilman <khilman@...prootsystems.com>,
	Tony Lindgren <tony@...mide.com>, linux-omap@...r.kernel.org,
	Lionel Debroux <lionel_debroux@...oo.fr>
Subject: Re: linux-next: manual merge of the trivial tree with the omap tree

Hi Jiri,

On Mon, 13 Dec 2010 11:01:59 +0100 (CET) Jiri Kosina <jkosina@...e.cz> wrote:
>
> Thank you Stephen. If you could carry this fixup patch, then it seems best 
> option for me. This conflict is trivial enough to be resolved later during 
> merge.

Yep, no worries.

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

Content of type "application/pgp-signature" skipped