diff for duplicates of <20180426094606.4775-5-srinivas.kandagatla@linaro.org>
diff --git a/a/content_digest b/N1/content_digest
index 5004bf4..8d28355 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -19,18 +19,19 @@
" bgoswami\@codeaurora.org\0"
]
[
- "Cc\0mark.rutland\@arm.com",
- " devicetree\@vger.kernel.org",
- " rohkumar\@qti.qualcomm.com",
- " gregkh\@linuxfoundation.org",
+ "Cc\0gregkh\@linuxfoundation.org",
+ " david.brown\@linaro.org",
+ " mark.rutland\@arm.com",
+ " lgirdwood\@gmail.com",
" plai\@codeaurora.org",
" tiwai\@suse.com",
- " lgirdwood\@gmail.com",
- " david.brown\@linaro.org",
- " Srinivas Kandagatla <srinivas.kandagatla\@linaro.org>",
+ " perex\@perex.cz",
+ " devicetree\@vger.kernel.org",
+ " linux-kernel\@vger.kernel.org",
" linux-arm-kernel\@lists.infradead.org",
+ " rohkumar\@qti.qualcomm.com",
" spatakok\@qti.qualcomm.com",
- " linux-kernel\@vger.kernel.org\0"
+ " Srinivas Kandagatla <srinivas.kandagatla\@linaro.org>\0"
]
[
"\0000:1\0"
@@ -187,4 +188,4 @@
"2.16.2"
]
-61f4cb04ca3fd90b460c146da521acd433ff17a10df4a291a4cdd1187e32758c
+07d66d0580ea5cc5342c1b52b7d19ced8f68a76fde614ccdb2b7a7df7635e19a
diff --git a/a/1.txt b/N2/1.txt
index a09a831..e7a2ec8 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -54,52 +54,52 @@ index 000000000000..05208a63dd3c
+
+= EXAMPLE
+
-+q6afe@4 {
++q6afe at 4 {
+ compatible = "qcom,q6afe";
+ reg = <APR_SVC_AFE>;
+
+ dais {
+ #sound-dai-cells = <1>;
-+ hdmi@1 {
++ hdmi at 1 {
+ reg = <1>;
+ };
+
-+ prim-mi2s-rx@16 {
++ prim-mi2s-rx at 16 {
+ reg = <16>;
+ qcom,sd-lines = <1 3>;
+ };
+
-+ prim-mi2s-tx@17 {
++ prim-mi2s-tx at 17 {
+ reg = <17>;
+ qcom,sd-lines = <2>;
+ };
+
-+ sec-mi2s-rx@18 {
++ sec-mi2s-rx at 18 {
+ reg = <18>;
+ qcom,sd-lines = <1 4>;
+ };
+
-+ sec-mi2s-tx@19 {
++ sec-mi2s-tx at 19 {
+ reg = <19>;
+ qcom,sd-lines = <2>;
+ };
+
-+ tert-mi2s-rx@20 {
++ tert-mi2s-rx at 20 {
+ reg = <20>;
+ qcom,sd-lines = <2 4>;
+ };
+
-+ tert-mi2s-tx@21 {
++ tert-mi2s-tx at 21 {
+ reg = <21>;
+ qcom,sd-lines = <1>;
+ };
+
-+ quat-mi2s-rx@22 {
++ quat-mi2s-rx at 22 {
+ reg = <22>;
+ qcom,sd-lines = <1>;
+ };
+
-+ quat-mi2s-tx@23 {
++ quat-mi2s-tx at 23 {
+ reg = <23>;
+ qcom,sd-lines = <2>;
+ };
diff --git a/a/content_digest b/N2/content_digest
index 5004bf4..fac4780 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,7 +2,7 @@
"ref\00020180426094606.4775-1-srinivas.kandagatla\@linaro.org\0"
]
[
- "From\0srinivas.kandagatla\@linaro.org\0"
+ "From\0srinivas.kandagatla\@linaro.org (srinivas.kandagatla at linaro.org)\0"
]
[
"Subject\0[PATCH v6 04/24] ASoC: qdsp6: dt-bindings: Add q6afe dt bindings\0"
@@ -11,26 +11,7 @@
"Date\0Thu, 26 Apr 2018 10:45:46 +0100\0"
]
[
- "To\0andy.gross\@linaro.org",
- " broonie\@kernel.org",
- " linux-arm-msm\@vger.kernel.org",
- " alsa-devel\@alsa-project.org",
- " robh+dt\@kernel.org",
- " bgoswami\@codeaurora.org\0"
-]
-[
- "Cc\0mark.rutland\@arm.com",
- " devicetree\@vger.kernel.org",
- " rohkumar\@qti.qualcomm.com",
- " gregkh\@linuxfoundation.org",
- " plai\@codeaurora.org",
- " tiwai\@suse.com",
- " lgirdwood\@gmail.com",
- " david.brown\@linaro.org",
- " Srinivas Kandagatla <srinivas.kandagatla\@linaro.org>",
- " linux-arm-kernel\@lists.infradead.org",
- " spatakok\@qti.qualcomm.com",
- " linux-kernel\@vger.kernel.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -95,52 +76,52 @@
"+\n",
"+= EXAMPLE\n",
"+\n",
- "+q6afe\@4 {\n",
+ "+q6afe at 4 {\n",
"+\tcompatible = \"qcom,q6afe\";\n",
"+\treg = <APR_SVC_AFE>;\n",
"+\n",
"+\tdais {\n",
"+\t\t#sound-dai-cells = <1>;\n",
- "+\t\thdmi\@1 {\n",
+ "+\t\thdmi at 1 {\n",
"+\t\t\treg = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tprim-mi2s-rx\@16 {\n",
+ "+\t\tprim-mi2s-rx at 16 {\n",
"+\t\t\treg = <16>;\n",
"+\t\t\tqcom,sd-lines = <1 3>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tprim-mi2s-tx\@17 {\n",
+ "+\t\tprim-mi2s-tx at 17 {\n",
"+\t\t\treg = <17>;\n",
"+\t\t\tqcom,sd-lines = <2>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tsec-mi2s-rx\@18 {\n",
+ "+\t\tsec-mi2s-rx at 18 {\n",
"+\t\t\treg = <18>;\n",
"+\t\t\tqcom,sd-lines = <1 4>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tsec-mi2s-tx\@19 {\n",
+ "+\t\tsec-mi2s-tx at 19 {\n",
"+\t\t\treg = <19>;\n",
"+\t\t\tqcom,sd-lines = <2>;\n",
"+\t\t};\n",
"+\n",
- "+\t\ttert-mi2s-rx\@20 {\n",
+ "+\t\ttert-mi2s-rx at 20 {\n",
"+\t\t\treg = <20>;\n",
"+\t\t\tqcom,sd-lines = <2 4>;\n",
"+\t\t};\n",
"+\n",
- "+\t\ttert-mi2s-tx\@21 {\n",
+ "+\t\ttert-mi2s-tx at 21 {\n",
"+\t\t\treg = <21>;\n",
"+\t\t\tqcom,sd-lines = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tquat-mi2s-rx\@22 {\n",
+ "+\t\tquat-mi2s-rx at 22 {\n",
"+\t\t\treg = <22>;\n",
"+\t\t\tqcom,sd-lines = <1>;\n",
"+\t\t};\n",
"+\n",
- "+\t\tquat-mi2s-tx\@23 {\n",
+ "+\t\tquat-mi2s-tx at 23 {\n",
"+\t\t\treg = <23>;\n",
"+\t\t\tqcom,sd-lines = <2>;\n",
"+\t\t};\n",
@@ -187,4 +168,4 @@
"2.16.2"
]
-61f4cb04ca3fd90b460c146da521acd433ff17a10df4a291a4cdd1187e32758c
+0ddf6081801c0c7e19d971811f4606409407f55417b3c88686bc039f52afa938
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.