The patch titled Subject: revert "ARM: keystone: dts: add psci command definition" has been added to the -mm tree. Its filename is revert-arm-keystone-dts-add-psci-command-definition.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/revert-arm-keystone-dts-add-psci-command-definition.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/revert-arm-keystone-dts-add-psci-command-definition.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: revert "ARM: keystone: dts: add psci command definition" Revert 51d5d12b8f3d ("ARM: keystone: dts: add psci command definition"), which was inadvertently added twice. Cc: Russell King - ARM Linux <linux@xxxxxxxxxxxxxxx> Cc: Vitaly Andrianov <vitalya@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/boot/dts/keystone.dtsi | 8 -------- 1 file changed, 8 deletions(-) diff -puN arch/arm/boot/dts/keystone.dtsi~revert-arm-keystone-dts-add-psci-command-definition arch/arm/boot/dts/keystone.dtsi --- a/arch/arm/boot/dts/keystone.dtsi~revert-arm-keystone-dts-add-psci-command-definition +++ a/arch/arm/boot/dts/keystone.dtsi @@ -70,14 +70,6 @@ cpu_on = <0x84000003>; }; - psci { - compatible = "arm,psci"; - method = "smc"; - cpu_suspend = <0x84000001>; - cpu_off = <0x84000002>; - cpu_on = <0x84000003>; - }; - soc { #address-cells = <1>; #size-cells = <1>; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch revert-arm-keystone-dts-add-psci-command-definition.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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