diff for duplicates of <1494863690.13948.0.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index f503d9a..bdd2745 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -5,36 +5,36 @@ On Thu, 2017-05-04 at 20:19 +0200, Martin Blumenstingl wrote: > > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> > --- -> ?drivers/clk/meson/gxbb.h??????????????| 2 +- -> ?include/dt-bindings/clock/gxbb-clkc.h | 1 - -> ?2 files changed, 1 insertion(+), 2 deletions(-) +> drivers/clk/meson/gxbb.h | 2 +- +> include/dt-bindings/clock/gxbb-clkc.h | 1 - +> 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h > index 3e5f375af7b6..c15bbce8c585 100644 > --- a/drivers/clk/meson/gxbb.h > +++ b/drivers/clk/meson/gxbb.h > @@ -171,7 +171,7 @@ -> ? * to be exposed to client nodes in DT: include/dt-bindings/clock/gxbb-clkc.h -> ? */ -> ?#define CLKID_SYS_PLL ??0 +> * to be exposed to client nodes in DT: include/dt-bindings/clock/gxbb-clkc.h +> */ +> #define CLKID_SYS_PLL 0 > -/* CLKID_CPUCLK */ -> +#define CLKID_CPUCLK ??1 -> ?/* CLKID_HDMI_PLL */ -> ?#define CLKID_FIXED_PLL ??3 -> ?/* CLKID_FCLK_DIV2 */ +> +#define CLKID_CPUCLK 1 +> /* CLKID_HDMI_PLL */ +> #define CLKID_FIXED_PLL 3 +> /* CLKID_FCLK_DIV2 */ > diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt- > bindings/clock/gxbb-clkc.h > index 3190e30b9398..46ff81fbc02e 100644 > --- a/include/dt-bindings/clock/gxbb-clkc.h > +++ b/include/dt-bindings/clock/gxbb-clkc.h > @@ -5,7 +5,6 @@ -> ?#ifndef __GXBB_CLKC_H -> ?#define __GXBB_CLKC_H -> ? +> #ifndef __GXBB_CLKC_H +> #define __GXBB_CLKC_H +> > -#define CLKID_CPUCLK 1 -> ?#define CLKID_HDMI_PLL 2 -> ?#define CLKID_FCLK_DIV2 4 -> ?#define CLKID_FCLK_DIV3 5 +> #define CLKID_HDMI_PLL 2 +> #define CLKID_FCLK_DIV2 4 +> #define CLKID_FCLK_DIV3 5 Applied. Thanks Jerome diff --git a/a/content_digest b/N1/content_digest index 492cb57..4b8cbec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,19 @@ "ref\020170401125519.7339-1-martin.blumenstingl@googlemail.com\0" "ref\020170504181920.21880-1-martin.blumenstingl@googlemail.com\0" "ref\020170504181920.21880-2-martin.blumenstingl@googlemail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v2 1/2] clk: meson-gxbb: un-export the CPU clock\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v2 1/2] clk: meson-gxbb: un-export the CPU clock\0" "Date\0Mon, 15 May 2017 17:54:50 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Martin Blumenstingl <martin.blumenstingl@googlemail.com>" + linux-amlogic@lists.infradead.org + narmstrong@baylibre.com + " linux-clk@vger.kernel.org\0" + "Cc\0devicetree@vger.kernel.org" + khilman@baylibre.com + carlo@caione.org + sboyd@codeaurora.org + mturquette@baylibre.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2017-05-04 at 20:19 +0200, Martin Blumenstingl wrote:\n" @@ -14,38 +23,38 @@ "> \n" "> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>\n" "> ---\n" - "> ?drivers/clk/meson/gxbb.h??????????????| 2 +-\n" - "> ?include/dt-bindings/clock/gxbb-clkc.h | 1 -\n" - "> ?2 files changed, 1 insertion(+), 2 deletions(-)\n" + "> \302\240drivers/clk/meson/gxbb.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240| 2 +-\n" + "> \302\240include/dt-bindings/clock/gxbb-clkc.h | 1 -\n" + "> \302\2402 files changed, 1 insertion(+), 2 deletions(-)\n" "> \n" "> diff --git a/drivers/clk/meson/gxbb.h b/drivers/clk/meson/gxbb.h\n" "> index 3e5f375af7b6..c15bbce8c585 100644\n" "> --- a/drivers/clk/meson/gxbb.h\n" "> +++ b/drivers/clk/meson/gxbb.h\n" "> @@ -171,7 +171,7 @@\n" - "> ? * to be exposed to client nodes in DT: include/dt-bindings/clock/gxbb-clkc.h\n" - "> ? */\n" - "> ?#define CLKID_SYS_PLL\t\t??0\n" + "> \302\240 * to be exposed to client nodes in DT: include/dt-bindings/clock/gxbb-clkc.h\n" + "> \302\240 */\n" + "> \302\240#define CLKID_SYS_PLL\t\t\302\240\302\2400\n" "> -/* CLKID_CPUCLK */\n" - "> +#define CLKID_CPUCLK\t\t??1\n" - "> ?/* CLKID_HDMI_PLL */\n" - "> ?#define CLKID_FIXED_PLL\t\t??3\n" - "> ?/* CLKID_FCLK_DIV2 */\n" + "> +#define CLKID_CPUCLK\t\t\302\240\302\2401\n" + "> \302\240/* CLKID_HDMI_PLL */\n" + "> \302\240#define CLKID_FIXED_PLL\t\t\302\240\302\2403\n" + "> \302\240/* CLKID_FCLK_DIV2 */\n" "> diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-\n" "> bindings/clock/gxbb-clkc.h\n" "> index 3190e30b9398..46ff81fbc02e 100644\n" "> --- a/include/dt-bindings/clock/gxbb-clkc.h\n" "> +++ b/include/dt-bindings/clock/gxbb-clkc.h\n" "> @@ -5,7 +5,6 @@\n" - "> ?#ifndef __GXBB_CLKC_H\n" - "> ?#define __GXBB_CLKC_H\n" - "> ?\n" + "> \302\240#ifndef __GXBB_CLKC_H\n" + "> \302\240#define __GXBB_CLKC_H\n" + "> \302\240\n" "> -#define CLKID_CPUCLK\t\t1\n" - "> ?#define CLKID_HDMI_PLL\t\t2\n" - "> ?#define CLKID_FCLK_DIV2\t\t4\n" - "> ?#define CLKID_FCLK_DIV3\t\t5\n" + "> \302\240#define CLKID_HDMI_PLL\t\t2\n" + "> \302\240#define CLKID_FCLK_DIV2\t\t4\n" + "> \302\240#define CLKID_FCLK_DIV3\t\t5\n" "\n" "Applied. Thanks\n" Jerome -e8dda46158fb0b4418b6e42d8b4d2d07e82635bc345117ddeef01025a63f5161 +97a7b1f88ef1d3b4893d6894166a2585b079a9e9e5526cb0ed6e3af9cdfb0da2
diff --git a/a/content_digest b/N2/content_digest index 492cb57..cdc8532 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,7 +4,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v2 1/2] clk: meson-gxbb: un-export the CPU clock\0" "Date\0Mon, 15 May 2017 17:54:50 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2017-05-04 at 20:19 +0200, Martin Blumenstingl wrote:\n" @@ -48,4 +48,4 @@ "Applied. Thanks\n" Jerome -e8dda46158fb0b4418b6e42d8b4d2d07e82635bc345117ddeef01025a63f5161 +768ab3bb5622d6be02c4429eb6f083d3ffb7b9a6f328d45ae8c87d55762481d4
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.