Subject: [folded-merged] reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,fengguang.wu@xxxxxxxxx,holt@xxxxxxx,rmk+kernel@xxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:33:46 -0700 The patch titled Subject: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix has been removed from the -mm tree. Its filename was reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix.patch This patch was dropped because it was folded into reboot-arm-change-reboot_mode-to-use-enum-reboot_mode.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix Cc: Robin Holt <holt@xxxxxxx> Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-omap2/omap4-restart.c | 1 + 1 file changed, 1 insertion(+) diff -puN arch/arm/mach-omap2/omap4-restart.c~reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix arch/arm/mach-omap2/omap4-restart.c --- a/arch/arm/mach-omap2/omap4-restart.c~reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix +++ a/arch/arm/mach-omap2/omap4-restart.c @@ -8,6 +8,7 @@ */ #include <linux/types.h> +#include <linux/reboot.h> #include "prminst44xx.h" /** _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch mm-remove-duplicated-call-of-get_pfn_range_for_nid.patch memcg-use-css_get-put-when-charging-uncharging-kmem.patch panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation.patch partitions-add-aix-lvm-partition-support-files.patch reboot-arm-change-reboot_mode-to-use-enum-reboot_mode.patch lib-add-lz4-compressor-module-fix.patch crypto-add-lz4-cryptographic-api-fix.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