Messages in this thread | | | Date | Tue, 25 Oct 2011 20:02:00 +1100 | From | Stephen Rothwell <> | 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |