diff for duplicates of <1494495904-18898-2-git-send-email-olivier.moysan@st.com>
diff --git a/a/content_digest b/N1/content_digest
index 29edfa5..d022c5f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,24 +11,24 @@
"Date\0Thu, 11 May 2017 11:45:02 +0200\0"
]
[
- "To\0<lgirdwood\@gmail.com>",
- " <broonie\@kernel.org>",
- " <perex\@perex.cz>",
- " <tiwai\@suse.com>",
- " <mcoquelin.stm32\@gmail.com>",
- " <alexandre.torgue\@st.com>",
- " <alsa-devel\@alsa-project.org>",
- " <robh\@kernel.org>",
- " <mark.rutland\@arm.com>",
- " <devicetree\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <kernel\@stlinux.com>",
- " <linux-kernel\@vger.kernel.org>",
- " <olivier.moysan\@st.com>\0"
+ "To\0lgirdwood\@gmail.com",
+ " broonie\@kernel.org",
+ " perex\@perex.cz",
+ " tiwai\@suse.com",
+ " mcoquelin.stm32\@gmail.com",
+ " alexandre.torgue\@st.com",
+ " alsa-devel\@alsa-project.org",
+ " robh\@kernel.org",
+ " mark.rutland\@arm.com",
+ " devicetree\@vger.kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " kernel\@stlinux.com",
+ " linux-kernel\@vger.kernel.org",
+ " olivier.moysan\@st.com\0"
]
[
- "Cc\0<arnaud.pouliquen\@st.com>",
- " <benjamin.gaignard\@st.com>\0"
+ "Cc\0arnaud.pouliquen\@st.com",
+ " benjamin.gaignard\@st.com\0"
]
[
"\0000:1\0"
@@ -123,4 +123,4 @@
"1.9.1"
]
-3595296de1c459459b3a1185951a163d517fb5452b5889557c114a05a85569a5
+b8a35c6bf4393256e91bb8c8ad49dce442a462a3e16ffe4b055c654669f324ab
diff --git a/a/1.txt b/N2/1.txt
index d18f522..957c8fb 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -47,7 +47,7 @@ index 0000000..67b854a
+ dais = <&i2s2_port 0>;
+};
+
-+i2s2: audio-controller@40003800 {
++i2s2: audio-controller at 40003800 {
+ compatible = "st,stm32h7-i2s";
+ #sound-dai-cells = <0>;
+ reg = <0x40003800 0x400>;
@@ -60,7 +60,7 @@ index 0000000..67b854a
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2s2>;
+
-+ i2s2_port: port@0 {
++ i2s2_port: port at 0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
@@ -74,7 +74,7 @@ index 0000000..67b854a
+};
+
+audio-codec {
-+ codec_port: port@0 {
++ codec_port: port at 0 {
+ codec_endpoint: endpoint {
+ remote-endpoint = <&cpu_endpoint>;
+ };
diff --git a/a/content_digest b/N2/content_digest
index 29edfa5..803fe3f 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\0001494495904-18898-1-git-send-email-olivier.moysan\@st.com\0"
]
[
- "From\0olivier moysan <olivier.moysan\@st.com>\0"
+ "From\0olivier.moysan\@st.com (olivier moysan)\0"
]
[
"Subject\0[PATCH v3 1/3] dt-bindings: Document STM32 I2S bindings\0"
@@ -11,24 +11,7 @@
"Date\0Thu, 11 May 2017 11:45:02 +0200\0"
]
[
- "To\0<lgirdwood\@gmail.com>",
- " <broonie\@kernel.org>",
- " <perex\@perex.cz>",
- " <tiwai\@suse.com>",
- " <mcoquelin.stm32\@gmail.com>",
- " <alexandre.torgue\@st.com>",
- " <alsa-devel\@alsa-project.org>",
- " <robh\@kernel.org>",
- " <mark.rutland\@arm.com>",
- " <devicetree\@vger.kernel.org>",
- " <linux-arm-kernel\@lists.infradead.org>",
- " <kernel\@stlinux.com>",
- " <linux-kernel\@vger.kernel.org>",
- " <olivier.moysan\@st.com>\0"
-]
-[
- "Cc\0<arnaud.pouliquen\@st.com>",
- " <benjamin.gaignard\@st.com>\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -86,7 +69,7 @@
"+\tdais = <&i2s2_port 0>;\n",
"+};\n",
"+\n",
- "+i2s2: audio-controller\@40003800 {\n",
+ "+i2s2: audio-controller at 40003800 {\n",
"+\tcompatible = \"st,stm32h7-i2s\";\n",
"+\t#sound-dai-cells = <0>;\n",
"+\treg = <0x40003800 0x400>;\n",
@@ -99,7 +82,7 @@
"+\tpinctrl-names = \"default\";\n",
"+\tpinctrl-0 = <&pinctrl_i2s2>;\n",
"+\n",
- "+\ti2s2_port: port\@0 {\n",
+ "+\ti2s2_port: port at 0 {\n",
"+\t\t#address-cells = <1>;\n",
"+\t\t#size-cells = <0>;\n",
"+\n",
@@ -113,7 +96,7 @@
"+};\n",
"+\n",
"+audio-codec {\n",
- "+\t\tcodec_port: port\@0 {\n",
+ "+\t\tcodec_port: port at 0 {\n",
"+\t\t\tcodec_endpoint: endpoint {\n",
"+\t\t\t\tremote-endpoint = <&cpu_endpoint>;\n",
"+\t\t};\n",
@@ -123,4 +106,4 @@
"1.9.1"
]
-3595296de1c459459b3a1185951a163d517fb5452b5889557c114a05a85569a5
+6f0eee515ea9d84899af9d42fd3002f076cc769ef5d7873a78cb27f9ac2912fc
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.