diff for duplicates of <1520687881-31399-1-git-send-email-yamada.masahiro@socionext.com>
diff --git a/a/content_digest b/N1/content_digest
index a8c6a33..f54e4e7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,16 +11,16 @@
"To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
- "Cc\0Thomas Gleixner <tglx\@linutronix.de>",
- " Philippe Ombredanne <pombredanne\@nexb.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
+ "Cc\0Mark Rutland <mark.rutland\@arm.com>",
" Rob Herring <robh\@kernel.org>",
" devicetree\@vger.kernel.org",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
+ " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
" linux-kernel\@vger.kernel.org",
+ " Russell King <linux\@armlinux.org.uk>",
+ " Masahiro Yamada <yamada.masahiro\@socionext.com>",
" Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Russell King <linux\@armlinux.org.uk>\0"
+ " Philippe Ombredanne <pombredanne\@nexb.com>",
+ " Thomas Gleixner <tglx\@linutronix.de>\0"
]
[
"\0000:1\0"
@@ -437,4 +437,4 @@
"2.7.4"
]
-6a04de74a67d9585161f84d4735c55fe059e5e323d4d9162e695d1f886c9a59d
+6a20b8b9511720da140362fd4b11c434edbc0c85440bc0bf975779d9f66c5d1f
diff --git a/a/1.txt b/N2/1.txt
index a4fdf7f..da74ecf 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -335,7 +335,7 @@ index 7a1c29b..04e60c2 100644
+// Author: Masahiro Yamada <yamada.masahiro@socionext.com>
&i2c0 {
- eeprom@50 {
+ eeprom at 50 {
diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts
index e052ea3..fe386fa 100644
--- a/arch/arm/boot/dts/uniphier-sld8-ref.dts
diff --git a/a/content_digest b/N2/content_digest
index a8c6a33..7933782 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,5 +1,5 @@
[
- "From\0Masahiro Yamada <yamada.masahiro\@socionext.com>\0"
+ "From\0yamada.masahiro\@socionext.com (Masahiro Yamada)\0"
]
[
"Subject\0[PATCH] ARM: dts: uniphier: use proper SPDX-License-Identifier style\0"
@@ -10,18 +10,6 @@
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
]
-[
- "Cc\0Thomas Gleixner <tglx\@linutronix.de>",
- " Philippe Ombredanne <pombredanne\@nexb.com>",
- " Greg Kroah-Hartman <gregkh\@linuxfoundation.org>",
- " Rob Herring <robh\@kernel.org>",
- " devicetree\@vger.kernel.org",
- " Masahiro Yamada <yamada.masahiro\@socionext.com>",
- " linux-kernel\@vger.kernel.org",
- " Rob Herring <robh+dt\@kernel.org>",
- " Mark Rutland <mark.rutland\@arm.com>",
- " Russell King <linux\@armlinux.org.uk>\0"
-]
[
"\0000:1\0"
]
@@ -366,7 +354,7 @@
"+// Author: Masahiro Yamada <yamada.masahiro\@socionext.com>\n",
" \n",
" &i2c0 {\n",
- " \teeprom\@50 {\n",
+ " \teeprom at 50 {\n",
"diff --git a/arch/arm/boot/dts/uniphier-sld8-ref.dts b/arch/arm/boot/dts/uniphier-sld8-ref.dts\n",
"index e052ea3..fe386fa 100644\n",
"--- a/arch/arm/boot/dts/uniphier-sld8-ref.dts\n",
@@ -437,4 +425,4 @@
"2.7.4"
]
-6a04de74a67d9585161f84d4735c55fe059e5e323d4d9162e695d1f886c9a59d
+39d8750ab4c6e262c697fb4d2dac51ca9e016728ca133a3f7f3cfbacd7160f7e
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.