diff for duplicates of <1607048778.15817.2.camel@mtksdccf07> diff --git a/a/1.txt b/N1/1.txt index 372a4ea..ad725a3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,6 +24,6 @@ I will fix that conflict. Thanks. _______________________________________________ -Linux-mediatek mailing list -Linux-mediatek@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-mediatek +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 39294f5..f60412b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -47,8 +47,8 @@ "Thanks.\n" "\n" "_______________________________________________\n" - "Linux-mediatek mailing list\n" - "Linux-mediatek@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-mediatek + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -b749afe412f640704b95094118ced32f28a49f3e9ad06c22467aee0ce65783db +56a12e61e0c3cd225c59e09c5f028286f3e0be1276a5cbcfaf462c74f5c14e0c
diff --git a/a/1.txt b/N2/1.txt index 372a4ea..bf1aeeb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,8 +22,3 @@ Sorry about that. I will fix that conflict. Thanks. - -_______________________________________________ -Linux-mediatek mailing list -Linux-mediatek@lists.infradead.org -http://lists.infradead.org/mailman/listinfo/linux-mediatek diff --git a/a/content_digest b/N2/content_digest index 39294f5..ada5194 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,19 +6,19 @@ "Subject\0Re: [PATCH v3 1/1] kasan: fix object remain in offline per-cpu quarantine\0" "Date\0Fri, 4 Dec 2020 10:26:18 +0800\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" - "Cc\0wsd_upstream <wsd_upstream@mediatek.com>" - Andrey Konovalov <andreyknvl@google.com> - linux-mediatek@lists.infradead.org + "Cc\0Andrey Konovalov <andreyknvl@google.com>" + Andrey Ryabinin <aryabinin@virtuozzo.com> + Alexander Potapenko <glider@google.com> + Dmitry Vyukov <dvyukov@google.com> + Matthias Brugger <matthias.bgg@gmail.com> + Nicholas Tang <nicholas.tang@mediatek.com> Miles Chen <miles.chen@mediatek.com> kasan-dev <kasan-dev@googlegroups.com> - LKML <linux-kernel@vger.kernel.org> Linux Memory Management List <linux-mm@kvack.org> - Nicholas Tang <nicholas.tang@mediatek.com> - Alexander Potapenko <glider@google.com> + LKML <linux-kernel@vger.kernel.org> Linux ARM <linux-arm-kernel@lists.infradead.org> - Matthias Brugger <matthias.bgg@gmail.com> - Andrey Ryabinin <aryabinin@virtuozzo.com> - " Dmitry Vyukov <dvyukov@google.com>\0" + <linux-mediatek@lists.infradead.org> + " wsd_upstream <wsd_upstream@mediatek.com>\0" "\00:1\0" "b\0" "On Thu, 2020-12-03 at 12:28 -0800, Andrew Morton wrote:\n" @@ -44,11 +44,6 @@ "Sorry about that.\n" "I will fix that conflict.\n" "\n" - "Thanks.\n" - "\n" - "_______________________________________________\n" - "Linux-mediatek mailing list\n" - "Linux-mediatek@lists.infradead.org\n" - http://lists.infradead.org/mailman/listinfo/linux-mediatek + Thanks. -b749afe412f640704b95094118ced32f28a49f3e9ad06c22467aee0ce65783db +f548bb1f32abbfe430cffb13408d7b42335dfb9cd51c6e2432feab27bffc7fd3
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.