linux-kernel - Re: linux-next: manual merge of the metag 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: <512B33E7.5010300@imgtec.com>
Date:	Mon, 25 Feb 2013 09:50:31 +0000
From:	James Hogan <james.hogan@...tec.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Rusty Russell" <rusty@...tcorp.com.au>,
	Mel Gorman <mgorman@...e.de>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the metag tree with Linus' tree

On 24/02/13 22:48, Stephen Rothwell wrote:
> Hi James,
> 
> Today's linux-next merge of the metag tree got a conflict in
> mm/page_alloc.c between commit 22b751c3d037 ("mm: rename page struct
> field helpers") from Linus' tree and commit 373d4d099761 ("taint: add
> explicit flag to show whether lock dep is still OK") from the metag tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Hi Stephen,

Looks good to me.

Thanks
James


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)