diff for duplicates of <20181213124154.GF21027@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index e08ee19..aeff82e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -90,10 +90,3 @@ index 1039f364f4cc..bee026e76a4c 100644
  	case OCSD_GEN_TRC_ELEM_TRACE_ON:
  		resp = cs_etm_decoder__buffer_discontinuity(decoder,
  							    trace_chan_id);
-
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 86a053c..980752c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -7,13 +7,13 @@
  "To\0Leo Yan <leo.yan@linaro.org>\0"
  "Cc\0Mathieu Poirier <mathieu.poirier@linaro.org>"
   Alexander Shishkin <alexander.shishkin@linux.intel.com>
-  Coresight ML <coresight@lists.linaro.org>
-  linux-kernel@vger.kernel.org
-  Namhyung Kim <namhyung@kernel.org>
-  Robert Walker <robert.walker@arm.com>
   Jiri Olsa <jolsa@redhat.com>
+  Namhyung Kim <namhyung@kernel.org>
   linux-arm-kernel@lists.infradead.org
- " Mike Leach <mike.leach@linaro.org>\0"
+  linux-kernel@vger.kernel.org
+  Coresight ML <coresight@lists.linaro.org>
+  Mike Leach <mike.leach@linaro.org>
+ " Robert Walker <robert.walker@arm.com>\0"
  "\00:1\0"
  "b\0"
  "Em Thu, Dec 13, 2018 at 09:38:54AM -0300, Arnaldo Carvalho de Melo escreveu:\n"
@@ -107,13 +107,6 @@
  "-\t\tbreak;\n"
  " \tcase OCSD_GEN_TRC_ELEM_TRACE_ON:\n"
  " \t\tresp = cs_etm_decoder__buffer_discontinuity(decoder,\n"
- " \t\t\t\t\t\t\t    trace_chan_id);\n"
- "\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ " \t\t\t\t\t\t\t    trace_chan_id);"
 
-c9ba47502f209e4d9f9ee480e0793fd8bdfc3f041cab6a31a4a6e5f90dbb819f
+60cbeb348a2c041a9aae82b44840401abd5ccf3988190758d927cca248bcd634
