* linux-next: manual merge of the akpm with the criver-core tree
@ 2011-10-25 9:02 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-10-25 9:02 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Greg KH, Dan Carpenter, Nathan Fontenot
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-25 9:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-25 9:02 linux-next: manual merge of the akpm with the criver-core tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox