diff for duplicates of <20180703070413.28756-4-andrew@aj.id.au>
diff --git a/a/1.txt b/N1/1.txt
index b322846..0a830fa 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -16,7 +16,7 @@ index 9766d7832d8b..30d39440b6f2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2741,6 +2741,7 @@ R: Andrew Jeffery <andrew@aj.id.au>
- L: openbmc@lists.ozlabs.org (moderated for non-subscribers)
+ L: openbmc at lists.ozlabs.org (moderated for non-subscribers)
S: Supported
F: Documentation/devicetree/bindings/misc/bmc-misc-ctrl.txt
+F: drivers/misc/bmc-misc-ctrl.c
@@ -295,7 +295,7 @@ index 000000000000..ff907029163f
+
+ /* Example children:
+ *
-+ * field@80.6 {
++ * field at 80.6 {
+ * compatible = "bmc-misc-control";
+ * reg = <0x80>;
+ * bit-mask = <0x1>;
@@ -303,7 +303,7 @@ index 000000000000..ff907029163f
+ * label = "ilpc2ahb-disable";
+ * };
+ *
-+ * field@70.6 {
++ * field at 70.6 {
+ * compatible = "bmc-misc-control";
+ * // Write-1-set/Write-1-clear semantics
+ * set-clear;
@@ -314,7 +314,7 @@ index 000000000000..ff907029163f
+ * label = "lpc-sio-decode-disable";
+ * };
+ *
-+ * field@50.0 {
++ * field at 50.0 {
+ * compatible = "bmc-misc-control";
+ * read-only;
+ * reg = <0x50>;
diff --git a/a/content_digest b/N1/content_digest
index 40785d9..b547481 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
"ref\00020180703070413.28756-1-andrew\@aj.id.au\0"
]
[
- "From\0Andrew Jeffery <andrew\@aj.id.au>\0"
+ "From\0andrew\@aj.id.au (Andrew Jeffery)\0"
]
[
"Subject\0[RFC PATCH 3/4] misc: Add bmc-misc-ctrl\0"
@@ -11,21 +11,7 @@
"Date\0Tue, 3 Jul 2018 17:04:12 +1000\0"
]
[
- "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
- "Cc\0Andrew Jeffery <andrew\@aj.id.au>",
- " robh+dt\@kernel.org",
- " mark.rutland\@arm.com",
- " joel\@jms.id.au",
- " gregkh\@linuxfoundation.org",
- " Eugene.Cho\@dell.com",
- " a.amelkin\@yadro.com",
- " stewart\@linux.ibm.com",
- " benh\@kernel.crashing.org",
- " openbmc\@lists.ozlabs.org",
- " devicetree\@vger.kernel.org",
- " linux-arm-kernel\@lists.infradead.org\0"
+ "To\0linux-arm-kernel\@lists.infradead.org\0"
]
[
"\0000:1\0"
@@ -52,7 +38,7 @@
"--- a/MAINTAINERS\n",
"+++ b/MAINTAINERS\n",
"\@\@ -2741,6 +2741,7 \@\@ R:\tAndrew Jeffery <andrew\@aj.id.au>\n",
- " L:\topenbmc\@lists.ozlabs.org (moderated for non-subscribers)\n",
+ " L:\topenbmc at lists.ozlabs.org (moderated for non-subscribers)\n",
" S:\tSupported\n",
" F:\tDocumentation/devicetree/bindings/misc/bmc-misc-ctrl.txt\n",
"+F:\tdrivers/misc/bmc-misc-ctrl.c\n",
@@ -331,7 +317,7 @@
"+\n",
"+\t/* Example children:\n",
"+\t *\n",
- "+\t * field\@80.6 {\n",
+ "+\t * field at 80.6 {\n",
"+\t * compatible = \"bmc-misc-control\";\n",
"+\t * reg = <0x80>;\n",
"+\t * bit-mask = <0x1>;\n",
@@ -339,7 +325,7 @@
"+\t * label = \"ilpc2ahb-disable\";\n",
"+\t * };\n",
"+\t *\n",
- "+\t * field\@70.6 {\n",
+ "+\t * field at 70.6 {\n",
"+\t * compatible = \"bmc-misc-control\";\n",
"+\t * // Write-1-set/Write-1-clear semantics\n",
"+\t * set-clear;\n",
@@ -350,7 +336,7 @@
"+\t * label = \"lpc-sio-decode-disable\";\n",
"+\t * };\n",
"+\t *\n",
- "+\t * field\@50.0 {\n",
+ "+\t * field at 50.0 {\n",
"+\t *\tcompatible = \"bmc-misc-control\";\n",
"+\t *\tread-only;\n",
"+\t *\treg = <0x50>;\n",
@@ -460,4 +446,4 @@
"2.17.1"
]
-fe3f5ef60783aa14850414b45057a7011eae673a0ddd7d1b0dd5413e793a1d9a
+7551857474e56c9f2bb496319b4b9d81ea3f1a248aaac5c49af076a88997bfe2
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.