diff for duplicates of <20180427172832.48840c3c@xhacker.debian> diff --git a/a/1.txt b/N1/1.txt index 82f2ebc..3fa367e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,8 +14,8 @@ index bf3a6c9a1d34..e23c49ae3ec2 100644 #size-cells = <0>; enable-method = "marvell,berlin-smp"; -- cpu at 0 { -+ cpu0: cpu at 0 { +- cpu@0 { ++ cpu0: cpu@0 { compatible = "arm,cortex-a9"; device_type = "cpu"; next-level-cache = <&l2>; @@ -23,24 +23,24 @@ index bf3a6c9a1d34..e23c49ae3ec2 100644 >; }; -- cpu at 1 { -+ cpu1: cpu at 1 { +- cpu@1 { ++ cpu1: cpu@1 { compatible = "arm,cortex-a9"; device_type = "cpu"; next-level-cache = <&l2>; reg = <1>; }; -- cpu at 2 { -+ cpu2: cpu at 2 { +- cpu@2 { ++ cpu2: cpu@2 { compatible = "arm,cortex-a9"; device_type = "cpu"; next-level-cache = <&l2>; reg = <2>; }; -- cpu at 3 { -+ cpu3: cpu at 3 { +- cpu@3 { ++ cpu3: cpu@3 { compatible = "arm,cortex-a9"; device_type = "cpu"; next-level-cache = <&l2>; @@ -54,6 +54,6 @@ index bf3a6c9a1d34..e23c49ae3ec2 100644 + <&cpu3>; }; - sdhci0: sdhci at ab0000 { + sdhci0: sdhci@ab0000 { -- 2.17.0 diff --git a/a/content_digest b/N1/content_digest index 8cbbf8a..93721ba 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ - "From\0Jisheng.Zhang@synaptics.com (Jisheng Zhang)\0" + "From\0Jisheng Zhang <Jisheng.Zhang@synaptics.com>\0" "Subject\0[PATCH] ARM: dts: berlin2q: add interrupt-affinity to pmu node\0" "Date\0Fri, 27 Apr 2018 17:28:32 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>" + Rob Herring <robh+dt@kernel.org> + " Mark Rutland <mark.rutland@arm.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add interrupt-affinity property to fix below warning:\n" @@ -20,8 +25,8 @@ " \t\t#size-cells = <0>;\n" " \t\tenable-method = \"marvell,berlin-smp\";\n" " \n" - "-\t\tcpu at 0 {\n" - "+\t\tcpu0: cpu at 0 {\n" + "-\t\tcpu@0 {\n" + "+\t\tcpu0: cpu@0 {\n" " \t\t\tcompatible = \"arm,cortex-a9\";\n" " \t\t\tdevice_type = \"cpu\";\n" " \t\t\tnext-level-cache = <&l2>;\n" @@ -29,24 +34,24 @@ " \t\t\t>;\n" " \t\t};\n" " \n" - "-\t\tcpu at 1 {\n" - "+\t\tcpu1: cpu at 1 {\n" + "-\t\tcpu@1 {\n" + "+\t\tcpu1: cpu@1 {\n" " \t\t\tcompatible = \"arm,cortex-a9\";\n" " \t\t\tdevice_type = \"cpu\";\n" " \t\t\tnext-level-cache = <&l2>;\n" " \t\t\treg = <1>;\n" " \t\t};\n" " \n" - "-\t\tcpu at 2 {\n" - "+\t\tcpu2: cpu at 2 {\n" + "-\t\tcpu@2 {\n" + "+\t\tcpu2: cpu@2 {\n" " \t\t\tcompatible = \"arm,cortex-a9\";\n" " \t\t\tdevice_type = \"cpu\";\n" " \t\t\tnext-level-cache = <&l2>;\n" " \t\t\treg = <2>;\n" " \t\t};\n" " \n" - "-\t\tcpu at 3 {\n" - "+\t\tcpu3: cpu at 3 {\n" + "-\t\tcpu@3 {\n" + "+\t\tcpu3: cpu@3 {\n" " \t\t\tcompatible = \"arm,cortex-a9\";\n" " \t\t\tdevice_type = \"cpu\";\n" " \t\t\tnext-level-cache = <&l2>;\n" @@ -60,8 +65,8 @@ "+\t\t\t\t\t <&cpu3>;\n" " \t\t};\n" " \n" - " \t\tsdhci0: sdhci at ab0000 {\n" + " \t\tsdhci0: sdhci@ab0000 {\n" "-- \n" 2.17.0 -daf2cbe247997c12e7c35e5f0bcda905ca5ad7bccba9a3a77154fde0e48ffb5a +9fb87a4eca08bc68e9ac6b5a508e6b38528ff1832c8c9ab0d4d230a1f69baf36
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.