lkml.org 
[lkml]   [2011]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2011-10-25 11:05    [W:0.041 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site