diff for duplicates of <20170922080211.GA24768@Red> diff --git a/a/1.txt b/N1/1.txt index 7b98758..4081a4e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Fri, Sep 22, 2017 at 09:49:45AM +0200, Maxime Ripard wrote: > > The unit address and register address does not match. > > This patch fix the register address with the good one. > > -> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> +> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > > --- > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) @@ -16,13 +16,13 @@ On Fri, Sep 22, 2017 at 09:49:45AM +0200, Maxime Ripard wrote: > > #size-cells = <0>; > > }; > > -> > - i2c2: i2c at 01c2b400 { -> > + i2c2: i2c at 1c2b400 { +> > - i2c2: i2c@01c2b400 { +> > + i2c2: i2c@1c2b400 { > > This one should be merged into the previous patch. > > The serie looks good otherwise, onec it's fixed, you can add my -> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> +> Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > > Maxime > @@ -31,3 +31,7 @@ For me this patch could be backported (since it fixes a bug) so I have put it ap But as requsted, I will merge it. Regards +-- +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 8eb5724..7e4a841 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,20 @@ "ref\020170921172151.29779-1-clabbe.montjoie@gmail.com\0" "ref\020170921172151.29779-3-clabbe.montjoie@gmail.com\0" "ref\020170922074945.jzibcgromgbhggxy@flea.lan\0" - "From\0clabbe.montjoie@gmail.com (Corentin Labbe)\0" - "Subject\0[PATCH 02/12] ARM: dts: sunxi: h3/h5: Fix i2c2 register address\0" + "ref\020170922074945.jzibcgromgbhggxy-ZC1Zs529Oq4@public.gmane.org\0" + "From\0Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 02/12] ARM: dts: sunxi: h3/h5: Fix i2c2 register address\0" "Date\0Fri, 22 Sep 2017 10:02:11 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" + mark.rutland-5wv7dgnIgG8@public.gmane.org + linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org + wens-jdAy2FN1RRM@public.gmane.org + catalin.marinas-5wv7dgnIgG8@public.gmane.org + will.deacon-5wv7dgnIgG8@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 Fri, Sep 22, 2017 at 09:49:45AM +0200, Maxime Ripard wrote:\n" @@ -12,7 +22,7 @@ "> > The unit address and register address does not match.\n" "> > This patch fix the register address with the good one.\n" "> > \n" - "> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>\n" + "> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "> > ---\n" "> > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 4 ++--\n" "> > 1 file changed, 2 insertions(+), 2 deletions(-)\n" @@ -25,13 +35,13 @@ "> > \t\t\t#size-cells = <0>;\n" "> > \t\t};\n" "> > \n" - "> > -\t\ti2c2: i2c at 01c2b400 {\n" - "> > +\t\ti2c2: i2c at 1c2b400 {\n" + "> > -\t\ti2c2: i2c@01c2b400 {\n" + "> > +\t\ti2c2: i2c@1c2b400 {\n" "> \n" "> This one should be merged into the previous patch.\n" "> \n" "> The serie looks good otherwise, onec it's fixed, you can add my\n" - "> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" + "> Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "> \n" "> Maxime\n" "> \n" @@ -39,6 +49,10 @@ "For me this patch could be backported (since it fixes a bug) so I have put it appart.\n" "But as requsted, I will merge it.\n" "\n" - Regards + "Regards\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 -34c19792ffd7f6217715d4fa9fa4a6bf4632dd136078fc8d891b1e87f6632230 +973b89691f70e63200994d7d69ef2b4be74c6e3f6d8cb85a48815ac612d10794
diff --git a/a/1.txt b/N2/1.txt index 7b98758..80719cc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -16,8 +16,8 @@ On Fri, Sep 22, 2017 at 09:49:45AM +0200, Maxime Ripard wrote: > > #size-cells = <0>; > > }; > > -> > - i2c2: i2c at 01c2b400 { -> > + i2c2: i2c at 1c2b400 { +> > - i2c2: i2c@01c2b400 { +> > + i2c2: i2c@1c2b400 { > > This one should be merged into the previous patch. > diff --git a/a/content_digest b/N2/content_digest index 8eb5724..7ad56db 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,19 @@ "ref\020170921172151.29779-1-clabbe.montjoie@gmail.com\0" "ref\020170921172151.29779-3-clabbe.montjoie@gmail.com\0" "ref\020170922074945.jzibcgromgbhggxy@flea.lan\0" - "From\0clabbe.montjoie@gmail.com (Corentin Labbe)\0" - "Subject\0[PATCH 02/12] ARM: dts: sunxi: h3/h5: Fix i2c2 register address\0" + "From\0Corentin Labbe <clabbe.montjoie@gmail.com>\0" + "Subject\0Re: [PATCH 02/12] ARM: dts: sunxi: h3/h5: Fix i2c2 register address\0" "Date\0Fri, 22 Sep 2017 10:02:11 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Cc\0robh+dt@kernel.org" + mark.rutland@arm.com + linux@armlinux.org.uk + wens@csie.org + catalin.marinas@arm.com + will.deacon@arm.com + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, Sep 22, 2017 at 09:49:45AM +0200, Maxime Ripard wrote:\n" @@ -25,8 +34,8 @@ "> > \t\t\t#size-cells = <0>;\n" "> > \t\t};\n" "> > \n" - "> > -\t\ti2c2: i2c at 01c2b400 {\n" - "> > +\t\ti2c2: i2c at 1c2b400 {\n" + "> > -\t\ti2c2: i2c@01c2b400 {\n" + "> > +\t\ti2c2: i2c@1c2b400 {\n" "> \n" "> This one should be merged into the previous patch.\n" "> \n" @@ -41,4 +50,4 @@ "\n" Regards -34c19792ffd7f6217715d4fa9fa4a6bf4632dd136078fc8d891b1e87f6632230 +faec49d2afeb7de578e654f9be8f6a00e1c7d9ab325232452ad093b38adb28fd
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.