- hibernation-should-work-ok-with-memory-hotplug.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     hibernation should work ok with memory hotplug
has been removed from the -mm tree.  Its filename was
     hibernation-should-work-ok-with-memory-hotplug.patch

This patch was dropped because it is premature

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: hibernation should work ok with memory hotplug
From: Pavel Machek <pavel@suse.cz>

hibernation + memory hotplug was disabled in kconfig because we could
not handle hibernation + sparse mem at some point. It seems to work
now, so I guess we can enable it.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Matt Tolentino <matthew.e.tolentino@intel.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/Kconfig |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff -puN mm/Kconfig~hibernation-should-work-ok-with-memory-hotplug mm/Kconfig
--- a/mm/Kconfig~hibernation-should-work-ok-with-memory-hotplug
+++ a/mm/Kconfig
@@ -128,12 +128,9 @@ config SPARSEMEM_VMEMMAP
 config MEMORY_HOTPLUG
 	bool "Allow for memory hot-add"
 	depends on SPARSEMEM || X86_64_ACPI_NUMA
-	depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
+	depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG
 	depends on (IA64 || X86 || PPC64 || SUPERH || S390)
 
-comment "Memory hotplug is currently incompatible with Software Suspend"
-	depends on SPARSEMEM && HOTPLUG && HIBERNATION