diff for duplicates of <20150303000418.GA30787@dtor-ws> diff --git a/a/1.txt b/N1/1.txt index 557a804..dc9f469 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ On Sat, Feb 28, 2015 at 08:35:56AM -0800, Scott Branden wrote: > Documents the Broadcom keypad controller device tree bindings. > -> Reviewed-by: Ray Jui <rjui@broadcom.com> -> Signed-off-by: Scott Branden <sbranden@broadcom.com> +> Reviewed-by: Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> +> Signed-off-by: Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> I folded this into the patch adding the driver itself and queued for 4.1. @@ -87,7 +87,7 @@ Thank you. > +#include "dt-bindings/input/input.h" > + > +/ { -> + keypad: keypad at 180ac000 { +> + keypad: keypad@180ac000 { > + /* Required SoC specific properties */ > + compatible = "brcm,bcm-keypad"; > + @@ -134,3 +134,7 @@ Thank you. -- Dmitry +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index e320f93..75be404 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,32 @@ "ref\0sbranden@broadcom.com\0" "ref\01425141357-7807-1-git-send-email-sbranden@broadcom.com\0" "ref\01425141357-7807-2-git-send-email-sbranden@broadcom.com\0" - "From\0dmitry.torokhov@gmail.com (Dmitry Torokhov)\0" - "Subject\0[PATCH v4 1/2] Input: bcm-keypad: add device tree bindings\0" + "ref\01425141357-7807-2-git-send-email-sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org\0" + "From\0Dmitry Torokhov <dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 1/2] Input: bcm-keypad: add device tree bindings\0" "Date\0Mon, 2 Mar 2015 16:04:18 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\0" + "Cc\0bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org" + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Jonathan Richardson <jonathar-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Dmitry Torokhov <dtor-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + Anatol Pomazao <anatol-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Sat, Feb 28, 2015 at 08:35:56AM -0800, Scott Branden wrote:\n" "> Documents the Broadcom keypad controller device tree bindings.\n" "> \n" - "> Reviewed-by: Ray Jui <rjui@broadcom.com>\n" - "> Signed-off-by: Scott Branden <sbranden@broadcom.com>\n" + "> Reviewed-by: Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" + "> Signed-off-by: Scott Branden <sbranden-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" "\n" "I folded this into the patch adding the driver itself and queued for\n" "4.1.\n" @@ -96,7 +111,7 @@ "> +#include \"dt-bindings/input/input.h\"\n" "> +\n" "> +/ {\n" - "> +\tkeypad: keypad at 180ac000 {\n" + "> +\tkeypad: keypad@180ac000 {\n" "> +\t\t/* Required SoC specific properties */\n" "> +\t\tcompatible = \"brcm,bcm-keypad\";\n" "> +\n" @@ -142,6 +157,10 @@ "> \n" "\n" "-- \n" - Dmitry + "Dmitry\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -33f4e7c2e3936d4b01ec1204b6fa6f1b967a972427eab86ddac3e681f1d2458b +e5841647d0c36b2b7c44bc9be7edf83ac21127d840515a6e6cfbe2d0e0d10a2d
diff --git a/a/1.txt b/N2/1.txt index 557a804..6ff4d3d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -87,7 +87,7 @@ Thank you. > +#include "dt-bindings/input/input.h" > + > +/ { -> + keypad: keypad at 180ac000 { +> + keypad: keypad@180ac000 { > + /* Required SoC specific properties */ > + compatible = "brcm,bcm-keypad"; > + diff --git a/a/content_digest b/N2/content_digest index e320f93..9f14daf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,23 @@ - "ref\0sbranden@broadcom.com\0" "ref\01425141357-7807-1-git-send-email-sbranden@broadcom.com\0" "ref\01425141357-7807-2-git-send-email-sbranden@broadcom.com\0" - "From\0dmitry.torokhov@gmail.com (Dmitry Torokhov)\0" - "Subject\0[PATCH v4 1/2] Input: bcm-keypad: add device tree bindings\0" + "From\0Dmitry Torokhov <dmitry.torokhov@gmail.com>\0" + "Subject\0Re: [PATCH v4 1/2] Input: bcm-keypad: add device tree bindings\0" "Date\0Mon, 2 Mar 2015 16:04:18 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Scott Branden <sbranden@broadcom.com>\0" + "Cc\0bcm-kernel-feedback-list@broadcom.com" + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Grant Likely <grant.likely@linaro.org> + Ray Jui <rjui@broadcom.com> + Jonathan Richardson <jonathar@broadcom.com> + Dmitry Torokhov <dtor@google.com> + Anatol Pomazao <anatol@google.com> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Sat, Feb 28, 2015 at 08:35:56AM -0800, Scott Branden wrote:\n" @@ -96,7 +109,7 @@ "> +#include \"dt-bindings/input/input.h\"\n" "> +\n" "> +/ {\n" - "> +\tkeypad: keypad at 180ac000 {\n" + "> +\tkeypad: keypad@180ac000 {\n" "> +\t\t/* Required SoC specific properties */\n" "> +\t\tcompatible = \"brcm,bcm-keypad\";\n" "> +\n" @@ -144,4 +157,4 @@ "-- \n" Dmitry -33f4e7c2e3936d4b01ec1204b6fa6f1b967a972427eab86ddac3e681f1d2458b +846044847f93cbcee88bb545fef85b851ecf9e5277320cbb5123cbd328b380f1
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.