diff for duplicates of <1527279436-14773-4-git-send-email-lsun@mellanox.com>
diff --git a/a/1.txt b/N1/1.txt
index 2338306..98d9597 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,20 +10,20 @@ diff --git a/MAINTAINERS b/MAINTAINERS
index 58b9861..85d5639 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1636,6 +1636,14 @@ L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
+@@ -1636,6 +1636,14 @@ L: linux-mediatek at lists.infradead.org (moderated for non-subscribers)
S: Maintained
F: drivers/phy/mediatek/phy-mtk-tphy.c
+ARM/Mellanox BlueField SoC support
+M: David Woods <dwoods@mellanox.com>
+M: Liming Sun <lsun@mellanox.com>
-+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
++L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: drivers/soc/mellanox/*
+F: Documentation/devicetree/bindings/soc/mellanox/tmfifo.txt
+
ARM/MICREL KS8695 ARCHITECTURE
M: Greg Ungerer <gerg@uclinux.org>
- L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
--
1.8.3.1
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 84e1691..e2fe2a0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,7 @@
"ref\0001527279436-14773-1-git-send-email-lsun\@mellanox.com\0"
]
[
- "ref\0b143b40446c1870fb8d422b364ead95d54552be9.1527264077.git.lsun\@mellanox.com\0"
-]
-[
- "From\0Liming Sun <lsun\@mellanox.com>\0"
+ "From\0lsun\@mellanox.com (Liming Sun)\0"
]
[
"Subject\0[PATCH v2 4/4] MAINTAINERS: Add entry for Mellanox Bluefield Soc\0"
@@ -14,15 +11,7 @@
"Date\0Fri, 25 May 2018 16:17:16 -0400\0"
]
[
- "To\0Olof Johansson <olof\@lixom.net>",
- " Arnd Bergmann <arnd\@arndb.de>",
- " David Woods <dwoods\@mellanox.com>",
- " Robin Murphy <robin.murphy\@arm.com>\0"
-]
-[
- "Cc\0devicetree\@vger.kernel.org",
- " Liming Sun <lsun\@mellanox.com>",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -43,23 +32,23 @@
"index 58b9861..85d5639 100644\n",
"--- a/MAINTAINERS\n",
"+++ b/MAINTAINERS\n",
- "\@\@ -1636,6 +1636,14 \@\@ L:\tlinux-mediatek\@lists.infradead.org (moderated for non-subscribers)\n",
+ "\@\@ -1636,6 +1636,14 \@\@ L:\tlinux-mediatek at lists.infradead.org (moderated for non-subscribers)\n",
" S:\tMaintained\n",
" F:\tdrivers/phy/mediatek/phy-mtk-tphy.c\n",
" \n",
"+ARM/Mellanox BlueField SoC support\n",
"+M:\tDavid Woods <dwoods\@mellanox.com>\n",
"+M:\tLiming Sun <lsun\@mellanox.com>\n",
- "+L:\tlinux-arm-kernel\@lists.infradead.org (moderated for non-subscribers)\n",
+ "+L:\tlinux-arm-kernel at lists.infradead.org (moderated for non-subscribers)\n",
"+S:\tMaintained\n",
"+F:\tdrivers/soc/mellanox/*\n",
"+F:\tDocumentation/devicetree/bindings/soc/mellanox/tmfifo.txt\n",
"+\n",
" ARM/MICREL KS8695 ARCHITECTURE\n",
" M:\tGreg Ungerer <gerg\@uclinux.org>\n",
- " L:\tlinux-arm-kernel\@lists.infradead.org (moderated for non-subscribers)\n",
+ " L:\tlinux-arm-kernel at lists.infradead.org (moderated for non-subscribers)\n",
"-- \n",
"1.8.3.1"
]
-7add4f10ccb815e49719f3ef05df8a24578a4d2eb1937b3efbda5537038a8164
+b66443092c364782cb3b068cada45c56e700e91aa1e1a7c17ff66e698ef48365
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.