diff for duplicates of <54C0D872.6010005@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 62e202e..515ccc0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -Le 22/01/2015 11:41, Josh Wu a écrit : +Le 22/01/2015 11:41, Josh Wu a ?crit : > As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, > so we need to apply it for sama5d4 chip. > @@ -29,7 +29,7 @@ Bye, > @@ -267,7 +267,7 @@ > }; > -> nand0: nand@80000000 { +> nand0: nand at 80000000 { > - compatible = "atmel,at91rm9200-nand"; > + compatible = "atmel,sama5d4-nand", "atmel,at91rm9200-nand"; > #address-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 6e3d288..badc6af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,23 +1,12 @@ "ref\01421656387-12538-2-git-send-email-josh.wu@atmel.com\0" "ref\01421923305-10088-1-git-send-email-josh.wu@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH v2] ARM: at91: sama5d4: dts: change the nand compatible string\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH v2] ARM: at91: sama5d4: dts: change the nand compatible string\0" "Date\0Thu, 22 Jan 2015 12:01:06 +0100\0" - "To\0Josh Wu <josh.wu@atmel.com>" - " Brian Norris <computersforpeace@gmail.com>\0" - "Cc\0Mark Rutland <mark.rutland@arm.com>" - devicetree@vger.kernel.org - Pawel Moll <pawel.moll@arm.com> - Boris Brezillon <boris.brezillon@free-electrons.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Rob Herring <robh+dt@kernel.org> - Alexandre Belloni <alexandre.belloni@free-electrons.com> - linux-mtd@lists.infradead.org - Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le 22/01/2015 11:41, Josh Wu a \303\251crit :\n" + "Le 22/01/2015 11:41, Josh Wu a ?crit :\n" "> As we introduce a new \"atmel,sama5d4-nand\" compatible string for sama5d4,\n" "> so we need to apply it for sama5d4 chip.\n" "> \n" @@ -48,7 +37,7 @@ "> @@ -267,7 +267,7 @@\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@80000000 {\n" + "> \t\tnand0: nand at 80000000 {\n" "> -\t\t\tcompatible = \"atmel,at91rm9200-nand\";\n" "> +\t\t\tcompatible = \"atmel,sama5d4-nand\", \"atmel,at91rm9200-nand\";\n" "> \t\t\t#address-cells = <1>;\n" @@ -60,4 +49,4 @@ "-- \n" Nicolas Ferre -7e70c12e40185fe59e7951f5d79e0460e068c97afd936a70361c1d75442a04e7 +445df0b8256e748dfd1f0ed15fc580dbeae14b8a48b4f0cb78eda6a139a91038
diff --git a/a/1.txt b/N2/1.txt index 62e202e..4d70a46 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,9 +2,9 @@ Le 22/01/2015 11:41, Josh Wu a écrit : > As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, > so we need to apply it for sama5d4 chip. > -> Signed-off-by: Josh Wu <josh.wu@atmel.com> +> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> -Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> +Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> Brian, I suppose that it makes sense to keep this patch with the previous one. @@ -40,3 +40,7 @@ Bye, -- Nicolas Ferre +-- +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/N2/content_digest index 6e3d288..026e07e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,29 +1,30 @@ "ref\01421656387-12538-2-git-send-email-josh.wu@atmel.com\0" "ref\01421923305-10088-1-git-send-email-josh.wu@atmel.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "ref\01421923305-10088-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" "Subject\0Re: [PATCH v2] ARM: at91: sama5d4: dts: change the nand compatible string\0" "Date\0Thu, 22 Jan 2015 12:01:06 +0100\0" - "To\0Josh Wu <josh.wu@atmel.com>" - " Brian Norris <computersforpeace@gmail.com>\0" - "Cc\0Mark Rutland <mark.rutland@arm.com>" - devicetree@vger.kernel.org - Pawel Moll <pawel.moll@arm.com> - Boris Brezillon <boris.brezillon@free-electrons.com> - Ian Campbell <ijc+devicetree@hellion.org.uk> - Rob Herring <robh+dt@kernel.org> - Alexandre Belloni <alexandre.belloni@free-electrons.com> - linux-mtd@lists.infradead.org - Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>" + " Brian Norris <computersforpeace-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@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> + " Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>\0" "\00:1\0" "b\0" "Le 22/01/2015 11:41, Josh Wu a \303\251crit :\n" "> As we introduce a new \"atmel,sama5d4-nand\" compatible string for sama5d4,\n" "> so we need to apply it for sama5d4 chip.\n" "> \n" - "> Signed-off-by: Josh Wu <josh.wu@atmel.com>\n" + "> Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" "Brian,\n" "I suppose that it makes sense to keep this patch with the previous one.\n" @@ -58,6 +59,10 @@ "\n" "\n" "-- \n" - Nicolas Ferre + "Nicolas Ferre\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 -7e70c12e40185fe59e7951f5d79e0460e068c97afd936a70361c1d75442a04e7 +dc5276006ccd430da39fe3c24f273f45f6cfdb6c9b430db758866baebebf334d
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.