linux-kernel - linux-next: manual merge of the akpm with the criver-core 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>] [day] [month] [year] [list]

Message-Id: <20111025200200.e3137b6d51d20fdb00a3c051@canb.auug.org.au>
Date:	Tue, 25 Oct 2011 20:02:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Greg KH <greg@...ah.com>,
	Dan Carpenter <dan.carpenter@...cle.com>,
	Nathan Fontenot <nfont@...tin.ibm.com>
Subject: linux-next: manual merge of the akpm with the criver-core tree

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
drivers/base/memory.c between commit de0ed36a3ecc ("Revert "memory
hotplug: Correct page reservation checking"") from the driver-core tree
and commit 587c3cc717df ("memory hotplug: release lock on an error path")
from the akpm tree.

The former commit reomved the code that is updated by the latter.  So I
did that.  Which means that I effectively dropped this patch.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped