diff for duplicates of <20180703075424.GC27649@kroah.com>
diff --git a/a/1.txt b/N1/1.txt
index 08e6bc4..e39a5b9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -17,7 +17,7 @@ On Tue, Jul 03, 2018 at 05:04:12PM +1000, Andrew Jeffery wrote:
> --- 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
@@ -311,7 +311,7 @@ That's an oddly-hard-coded array size for no good reason :(
> +
> + /* Example children:
> + *
-> + * field@80.6 {
+> + * field at 80.6 {
> + * compatible = "bmc-misc-control";
> + * reg = <0x80>;
> + * bit-mask = <0x1>;
@@ -319,7 +319,7 @@ That's an oddly-hard-coded array size for no good reason :(
> + * label = "ilpc2ahb-disable";
> + * };
> + *
-> + * field@70.6 {
+> + * field at 70.6 {
> + * compatible = "bmc-misc-control";
> + * // Write-1-set/Write-1-clear semantics
> + * set-clear;
@@ -330,7 +330,7 @@ That's an oddly-hard-coded array size for no good reason :(
> + * 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 f0540a8..885b1df 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,29 +5,16 @@
"ref\00020180703070413.28756-4-andrew\@aj.id.au\0"
]
[
- "From\0Greg KH <gregkh\@linuxfoundation.org>\0"
+ "From\0gregkh\@linuxfoundation.org (Greg KH)\0"
]
[
- "Subject\0Re: [RFC PATCH 3/4] misc: Add bmc-misc-ctrl\0"
+ "Subject\0[RFC PATCH 3/4] misc: Add bmc-misc-ctrl\0"
]
[
"Date\0Tue, 3 Jul 2018 09:54:24 +0200\0"
]
[
- "To\0Andrew Jeffery <andrew\@aj.id.au>\0"
-]
-[
- "Cc\0linux-kernel\@vger.kernel.org",
- " robh+dt\@kernel.org",
- " mark.rutland\@arm.com",
- " joel\@jms.id.au",
- " 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"
@@ -55,7 +42,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",
@@ -349,7 +336,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",
@@ -357,7 +344,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",
@@ -368,7 +355,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",
@@ -422,4 +409,4 @@
"greg k-h"
]
-0a0e9e23564880a508b4da4e06bd924186951a6ff4e2a019b8b4dcd2dbded4ca
+985cc6c1bede97c143f00f8142da2046e4b1fae93546220ff1ef614ca1d36b8b
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.