The patch titled linux/init.h: simplify __mem{init,exit}* dependencies has been removed from the -mm tree. Its filename was linux-inith-simplify-__meminitexit-dependencies.patch This patch was dropped because Sam merged a patch which broke it The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: linux/init.h: simplify __mem{init,exit}* dependencies From: Adrian Bunk <bunk@xxxxxxxxxx> Simplify the dependencies on __mem{init,exit}* (ACPI_HOTPLUG_MEMORY requires MEMORY_HOTPLUG). Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/init.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN include/linux/init.h~linux-inith-simplify-__meminitexit-dependencies include/linux/init.h --- a/include/linux/init.h~linux-inith-simplify-__meminitexit-dependencies +++ a/include/linux/init.h @@ -279,8 +279,7 @@ void __init parse_early_param(void); #define __cpuexitdata __exitdata #endif -#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \ - || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE) +#if defined(CONFIG_MEMORY_HOTPLUG) #define __meminit #define __meminitdata #define __memexit _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are git-acpi.patch git-dvb.patch git-infiniband.patch git-kbuild.patch git-mtd.patch git-net.patch git-battery.patch drivers-bluetooth-bpa10xc-fix-memleak.patch drivers-bluetooth-btsdioc-fix-double-free.patch if-0-pci_cleanup_aer_correct_error_status.patch git-scsi-misc.patch scsi-advansysc-make-3-functions-static.patch scsi-aic94xx-cleanups.patch scsi-aic94xx-cleanups-checkpatch-fixes.patch scsi-aic94xx-cleanups-checkpatch-fixes-checkpatch-fixes.patch usb-make-usb_storage_onetouch-available-with-pm.patch git-x86.patch git-cryptodev.patch git-xtensa.patch mm-page-writebackc-make-a-function-static.patch make-__vmalloc_area_node-static.patch m68knommu-remove-duplicate-exports.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch nubus-kill-drivers-nubus-nubus_symsc.patch m68k-kill-arch-m68k-mac-mac_ksymsc.patch m68k-kill-arch-m68k-hp300-ksymsc.patch m68k-kill-arch-m68k-amiga-amiga_ksymsc.patch m68k-kill-arch-m68k-atari-atari_ksymsc.patch m68k-kill-arch-m68k-mvme16x-mvme16x_ksymsc.patch make-ipc-utilcsysvipc_find_ipc-static.patch cleanup-after-apus-removal.patch remove-mm_ptovvtop.patch proper-show_interrupts-prototype.patch scheduled-oss-driver-removal.patch linux-inith-simplify-__meminitexit-dependencies.patch proper-prototype-for-signals_init.patch kernel-ptracec-should-include-linux-syscallsh.patch make-srcu_readers_active-static.patch kernel-notifierc-should-include-linux-rebooth.patch proper-prototype-for-get_filesystem_list.patch fs-utimesc-should-include-linux-syscallsh.patch fs-signalfdc-should-include-linux-syscallsh.patch fs-eventfdc-should-include-linux-syscallsh.patch proper-prototype-for-vty_init.patch drivers-misc-lkdtmc-cleanups.patch xen-fiddle_vdso-must-be-__init.patch calibrate_delay-must-be-__cpuinit.patch idle_regs-must-be-__cpuinit.patch fs-ecryptfs-possible-cleanups.patch make-video-geode-lxfb_corecgeode_modedb-static.patch video-hpfbc-section-fix.patch drivers-video-pm3fbc-section-fix.patch make-jbd-journalc__journal_abort_hard-static.patch move-edactxt-two-levels-up.patch remove-documentation-smptxt.patch kernel-cgroupc-remove-dead-code.patch kernel-cgroupc-make-2-functions-static.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch fix-m32r-__xchg.patch kill-udffs_dateversion.patch reiser4.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html