All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <1446844273-6460-2-git-send-email-kapilh@broadcom.com>

diff --git a/a/content_digest b/N1/content_digest
index 74c2582..f047963 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -33,10 +33,10 @@
   " Paul Walmsley <paul\@pwsan.com>",
   " Linus Walleij <linus.walleij\@linaro.org>",
   " Chen-Yu Tsai <wens\@csie.org>",
-  " <devicetree\@vger.kernel.org>",
-  " <linux-arm-kernel\@lists.infradead.org>",
-  " <linux-kernel\@vger.kernel.org>",
-  " <bcm-kernel-feedback-list\@broadcom.com>",
+  " devicetree\@vger.kernel.org",
+  " linux-arm-kernel\@lists.infradead.org",
+  " linux-kernel\@vger.kernel.org",
+  " bcm-kernel-feedback-list\@broadcom.com",
   " Kapil Hali <kapilh\@broadcom.com>\0"
 ]
 [
@@ -116,4 +116,4 @@
   "2.1.0"
 ]
 
-2d292ef9e518b58dd0a3109c02048c2e9b696779b9f533d205e71840834359e9
+25f6b6027aa7e59ed22b7e377d782f5ac8e4d8db238de0abc5a581fe2546d613

diff --git a/a/1.txt b/N2/1.txt
index 88aa2bf..f2295e1 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -38,14 +38,14 @@ index 0000000..8506da7
 +		enable-method = "brcm,bcm-nsp-smp";
 +		secondary-boot-reg = <0xffff042c>;
 +
-+		cpu0: cpu@0 {
++		cpu0: cpu at 0 {
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a9";
 +			next-level-cache = <&L2>;
 +			reg = <0>;
 +		};
 +
-+		cpu1: cpu@1 {
++		cpu1: cpu at 1 {
 +			device_type = "cpu";
 +			compatible = "arm,cortex-a9";
 +			next-level-cache = <&L2>;
diff --git a/a/content_digest b/N2/content_digest
index 74c2582..2541d4c 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
   "ref\0001446844273-6460-1-git-send-email-kapilh\@broadcom.com\0"
 ]
 [
-  "From\0Kapil Hali <kapilh\@broadcom.com>\0"
+  "From\0kapilh\@broadcom.com (Kapil Hali)\0"
 ]
 [
   "Subject\0[PATCH v3 1/4] dt-bindings: add SMP enable-method for Broadcom NSP\0"
@@ -11,33 +11,7 @@
   "Date\0Fri, 6 Nov 2015 16:11:10 -0500\0"
 ]
 [
-  "To\0Rob Herring <robh+dt\@kernel.org>",
-  " Pawel Moll <pawel.moll\@arm.com>",
-  " Mark Rutland <mark.rutland\@arm.com>",
-  " Ian Campbell <ijc+devicetree\@hellion.org.uk>",
-  " Kumar Gala <galak\@codeaurora.org>",
-  " Russell King <linux\@arm.linux.org.uk>",
-  " Ray Jui <rjui\@broadcom.com>",
-  " Scott Branden <sbranden\@broadcom.com>",
-  " Jon Mason <jonmason\@broadcom.com>",
-  " Florian Fainelli <f.fainelli\@gmail.com>\0"
-]
-[
-  "Cc\0Gregory Fong <gregory.0xf0\@gmail.com>",
-  " Lee Jones <lee\@kernel.org>",
-  " Hauke Mehrtens <hauke\@hauke-m.de>",
-  " Heiko Stuebner <heiko\@sntech.de>",
-  " Kever Yang <kever.yang\@rock-chips.com>",
-  " Maxime Ripard <maxime.ripard\@free-electrons.com>",
-  " Olof Johansson <olof\@lixom.net>",
-  " Paul Walmsley <paul\@pwsan.com>",
-  " Linus Walleij <linus.walleij\@linaro.org>",
-  " Chen-Yu Tsai <wens\@csie.org>",
-  " <devicetree\@vger.kernel.org>",
-  " <linux-arm-kernel\@lists.infradead.org>",
-  " <linux-kernel\@vger.kernel.org>",
-  " <bcm-kernel-feedback-list\@broadcom.com>",
-  " Kapil Hali <kapilh\@broadcom.com>\0"
+  "To\0linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -86,14 +60,14 @@
   "+\t\tenable-method = \"brcm,bcm-nsp-smp\";\n",
   "+\t\tsecondary-boot-reg = <0xffff042c>;\n",
   "+\n",
-  "+\t\tcpu0: cpu\@0 {\n",
+  "+\t\tcpu0: cpu at 0 {\n",
   "+\t\t\tdevice_type = \"cpu\";\n",
   "+\t\t\tcompatible = \"arm,cortex-a9\";\n",
   "+\t\t\tnext-level-cache = <&L2>;\n",
   "+\t\t\treg = <0>;\n",
   "+\t\t};\n",
   "+\n",
-  "+\t\tcpu1: cpu\@1 {\n",
+  "+\t\tcpu1: cpu at 1 {\n",
   "+\t\t\tdevice_type = \"cpu\";\n",
   "+\t\t\tcompatible = \"arm,cortex-a9\";\n",
   "+\t\t\tnext-level-cache = <&L2>;\n",
@@ -116,4 +90,4 @@
   "2.1.0"
 ]
 
-2d292ef9e518b58dd0a3109c02048c2e9b696779b9f533d205e71840834359e9
+e20c429016f1fc532cdc9d8017821649d3679aaaadb461c6378a4989c1eaa803
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.