diff for duplicates of <20190607182047.GK21245@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 28567f2..91706dc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -115,8 +115,3 @@ index 33b57e748c3d..bc848fd095f4 100644
  #define BMVAL(val, lsb, msb)	((val & GENMASK(msb, lsb)) >> lsb)
  
  #define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))
-
-_______________________________________________
-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 38a7355..35ce5e3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,20 +1,20 @@
  "ref\020190524173508.29044-1-mathieu.poirier@linaro.org\0"
  "ref\020190524173508.29044-2-mathieu.poirier@linaro.org\0"
  "ref\068c1c548-33cd-31e8-100d-7ffad008c7b2@arm.com\0"
- "From\0Arnaldo Carvalho de Melo <acme@kernel.org>\0"
+ "From\0Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>\0"
  "Subject\0Re: [PATCH v2 01/17] perf tools: Configure contextID tracing in CPU-wide mode\0"
  "Date\0Fri, 7 Jun 2019 15:20:47 -0300\0"
  "To\0Suzuki K Poulose <suzuki.poulose@arm.com>\0"
  "Cc\0mathieu.poirier@linaro.org"
   Peter Zijlstra <peterz@infradead.org>
-  coresight@lists.linaro.org
-  linux-kernel@vger.kernel.org
+  Ingo Molnar <mingo@kernel.org>
   Alexander Shishkin <alexander.shishkin@linux.intel.com>
   Jiri Olsa <jolsa@kernel.org>
-  leo.yan@linaro.org
   Namhyung Kim <namhyung@kernel.org>
-  Ingo Molnar <mingo@kernel.org>
- " linux-arm-kernel@lists.infradead.org\0"
+  leo.yan@linaro.org
+  linux-kernel@vger.kernel.org
+  linux-arm-kernel@lists.infradead.org
+ " coresight@lists.linaro.org\0"
  "\00:1\0"
  "b\0"
  "Em Fri, Jun 07, 2019 at 10:21:36AM +0100, Suzuki K Poulose escreveu:\n"
@@ -133,11 +133,6 @@
  "-\n"
  " #define BMVAL(val, lsb, msb)\t((val & GENMASK(msb, lsb)) >> lsb)\n"
  " \n"
- " #define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))\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
+  #define CS_ETM_HEADER_SIZE (CS_HEADER_VERSION_0_MAX * sizeof(u64))
 
-df9659756435686e38352e273837b9fa5089429cc0e778148f30c3bc68aa78b0
+05c310dc22b2a530d8912997cda0674c4d1ca1500d9428e910933ff2f605bda0
