diff for duplicates of <20160701020836.GA1722@rob-hp-laptop> diff --git a/a/1.txt b/N1/1.txt index 2ad172a..1e26206 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,8 +37,8 @@ to use "firmware-name" here. > - interrupt-parent : the phandle for the interrupt controller to which the > device interrupts are connected. > - interrupts : specifies attributes for the out-of-band interrupt (host-wake). -> @@ -34,6 +35,7 @@ mmc3: mmc@01c12000 { -> brcmf: bcrmf@1 { +> @@ -34,6 +35,7 @@ mmc3: mmc at 01c12000 { +> brcmf: bcrmf at 1 { > reg = <1>; > compatible = "brcm,bcm4329-fmac"; > + brcm,nvram_file_name = "brcm/brcmfmac43362-ap6210.txt"; diff --git a/a/content_digest b/N1/content_digest index 0c77629..c5ff810 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,8 @@ "ref\01467209074-15634-1-git-send-email-hdegoede@redhat.com\0" - "From\0Rob Herring <robh@kernel.org>\0" - "Subject\0Re: [PATCH 1/4] brcmfmac: Add brcm,nvram_file_name dt property\0" + "From\0robh@kernel.org (Rob Herring)\0" + "Subject\0[PATCH 1/4] brcmfmac: Add brcm,nvram_file_name dt property\0" "Date\0Thu, 30 Jun 2016 21:08:36 -0500\0" - "To\0Hans de Goede <hdegoede@redhat.com>\0" - "Cc\0John W . Linville <linville@tuxdriver.com>" - devicetree <devicetree@vger.kernel.org> - linux-wireless@vger.kernel.org - linux-sunxi@googlegroups.com - Chen-Yu Tsai <wens@csie.org> - Arend van Spriel <arend@broadcom.com> - Maxime Ripard <maxime.ripard@free-electrons.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Jun 29, 2016 at 04:04:31PM +0200, Hans de Goede wrote:\n" @@ -52,8 +44,8 @@ "> - interrupt-parent : the phandle for the interrupt controller to which the\n" "> \tdevice interrupts are connected.\n" "> - interrupts : specifies attributes for the out-of-band interrupt (host-wake).\n" - "> @@ -34,6 +35,7 @@ mmc3: mmc@01c12000 {\n" - "> \tbrcmf: bcrmf@1 {\n" + "> @@ -34,6 +35,7 @@ mmc3: mmc at 01c12000 {\n" + "> \tbrcmf: bcrmf at 1 {\n" "> \t\treg = <1>;\n" "> \t\tcompatible = \"brcm,bcm4329-fmac\";\n" "> +\t\tbrcm,nvram_file_name = \"brcm/brcmfmac43362-ap6210.txt\";\n" @@ -61,4 +53,4 @@ "> \t\tinterrupts = <10 8>; /* PH10 / EINT10 */\n" "> \t\tinterrupt-names = \"host-wake\";" -5ce565505c3388217b051b05343a7e0f19f1fc7bb104ea596f8fa119b37c3dcf +dcb26de44446ab05a11018f4d0905422ac5d820825a746976f1ba2e1c38f056d
diff --git a/a/1.txt b/N2/1.txt index 2ad172a..9ae0127 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,7 @@ key/value pairs so it would match up well. Also, I have to wonder how all the non-SDIO based cards don't need this file. -> Signed-off-by: Hans de Goede <hdegoede@redhat.com> +> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > .../devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt | 2 ++ > drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 ++ diff --git a/a/content_digest b/N2/content_digest index 0c77629..23dc5ba 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,17 @@ "ref\01467209074-15634-1-git-send-email-hdegoede@redhat.com\0" - "From\0Rob Herring <robh@kernel.org>\0" + "ref\01467209074-15634-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0" + "From\0Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH 1/4] brcmfmac: Add brcm,nvram_file_name dt property\0" "Date\0Thu, 30 Jun 2016 21:08:36 -0500\0" - "To\0Hans de Goede <hdegoede@redhat.com>\0" - "Cc\0John W . Linville <linville@tuxdriver.com>" - devicetree <devicetree@vger.kernel.org> - linux-wireless@vger.kernel.org - linux-sunxi@googlegroups.com - Chen-Yu Tsai <wens@csie.org> - Arend van Spriel <arend@broadcom.com> - Maxime Ripard <maxime.ripard@free-electrons.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "Cc\0John W . Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>" + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> + Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> + Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Wed, Jun 29, 2016 at 04:04:31PM +0200, Hans de Goede wrote:\n" @@ -27,7 +28,7 @@ "Also, I have to wonder how all the non-SDIO based cards don't need this \n" "file.\n" " \n" - "> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" + "> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" "> ---\n" "> .../devicetree/bindings/net/wireless/brcm,bcm43xx-fmac.txt | 2 ++\n" "> drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 2 ++\n" @@ -61,4 +62,4 @@ "> \t\tinterrupts = <10 8>; /* PH10 / EINT10 */\n" "> \t\tinterrupt-names = \"host-wake\";" -5ce565505c3388217b051b05343a7e0f19f1fc7bb104ea596f8fa119b37c3dcf +b3864d849f6743df05096fd43e4c55e6177c7d7824a578e65a3156a47681537b
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.