Subject: [folded-merged] reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,gxt@xxxxxxxxxxxxxxx,holt@xxxxxxx,hpa@xxxxxxxxx,rja@xxxxxxx,rmk+kernel@xxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:33:44 -0700 The patch titled Subject: reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix has been removed from the -mm tree. Its filename was reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-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 arch/arm/mach-socfpga/socfpga.c Cc: Guan Xuetao <gxt@xxxxxxxxxxxxxxx> Cc: H. Peter Anvin <hpa@xxxxxxxxx> Cc: Robin Holt <holt@xxxxxxx> Cc: Russ Anderson <rja@xxxxxxx> Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-socfpga/socfpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/arm/mach-socfpga/socfpga.c~reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix arch/arm/mach-socfpga/socfpga.c --- a/arch/arm/mach-socfpga/socfpga.c~reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix +++ a/arch/arm/mach-socfpga/socfpga.c @@ -96,7 +96,7 @@ static void socfpga_cyclone5_restart(enu temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL); - if (mode == 'h') + if (mode == REBOOT_HARD) temp |= RSTMGR_CTRL_SWCOLDRSTREQ; else temp |= RSTMGR_CTRL_SWWARMRSTREQ; _ 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 reboot-arm-change-reboot_mode-to-use-enum-reboot_mode-fix-fix.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