* [git pull] clk: renesas: Updates for v4.10 (take two)
@ 2016-11-07 15:35 Geert Uytterhoeven
2016-11-17 23:07 ` Stephen Boyd
0 siblings, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2016-11-07 15:35 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd, Simon Horman
Cc: linux-clk, linux-renesas-soc, Geert Uytterhoeven
Hi Mike, Stephen,
The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7:
clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2
for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13:
Merge branch 'rzg-clock-defs' into clk-renesas-for-v4.10 (2016-11-07 15:15:33 +0100)
----------------------------------------------------------------
clk: renesas: Updates for v4.10 (take two)
- Add R-Car RST driver for obtaining mode pin state, and move the
related functionality from platform code to DT,
- Add r8a7743 and r8a7745 CPG Core Clock Definitions.
After this:
- Simon can pull from
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git rcar-rst
and queue up more cleanups in platform code, which depend on the
clock drivers using the RST driver,
- Simon can pull from
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git zg-clock-defs
and queue up the RZ/G1M and RZ/G1E DTS files, which depend on the
CPG Core Clock Definitions.
- I can queue up the RZ/G1M and RZ/G1E clock drivers, which depend on
both.
Thanks for pulling!
----------------------------------------------------------------
Geert Uytterhoeven (25):
reset: Add renesas,rst DT bindings
soc: renesas: Add R-Car RST driver
ARM: dts: r8a7778: Add device node for RESET/WDT module
ARM: dts: r8a7779: Add device node for RESET/WDT module
ARM: dts: r8a7790: Add device node for RST module
ARM: dts: r8a7791: Add device node for RST module
ARM: dts: r8a7792: Add device node for RST module
ARM: dts: r8a7793: Add device node for RST module
ARM: dts: r8a7794: Add device node for RST module
arm64: renesas: r8a7795 dtsi: Add device node for RST module
arm64: renesas: r8a7796 dtsi: Add device node for RST module
clk: renesas: r8a7778: Obtain mode pin values using R-Car RST driver
clk: renesas: r8a7779: Obtain mode pin values from R-Car RST driver
clk: renesas: rcar-gen2: Obtain mode pin values using RST driver
clk: renesas: r8a7795: Obtain mode pin values from R-Car RST driver
clk: renesas: r8a7796: Obtain mode pin values from R-Car RST driver
clk: renesas: rcar-gen3-cpg: Remove obsolete rcar_gen3_read_mode_pins()
ARM: shmobile: r8a7778: Stop passing mode pins state to clock driver
ARM: shmobile: r8a7779: Stop passing mode pins state to clock driver
ARM: shmobile: rcar-gen2: Stop passing mode pins state to clock driver
clk: renesas: r8a7778: Remove obsolete r8a7778_clocks_init()
clk: renesas: r8a7779: Remove obsolete r8a7779_clocks_init()
clk: renesas: rcar-gen2: Remove obsolete rcar_gen2_clocks_init()
Merge branch 'rcar-rst' into clk-renesas-for-v4.10
Merge branch 'rzg-clock-defs' into clk-renesas-for-v4.10
Sergei Shtylyov (2):
clk: renesas: Add r8a7743 CPG Core Clock Definitions
clk: renesas: Add r8a7745 CPG Core Clock Definitions
.../devicetree/bindings/reset/renesas,rst.txt | 37 +++++++++
arch/arm/boot/dts/r8a7778.dtsi | 5 ++
arch/arm/boot/dts/r8a7779.dtsi | 5 ++
arch/arm/boot/dts/r8a7790.dtsi | 5 ++
arch/arm/boot/dts/r8a7791.dtsi | 5 ++
arch/arm/boot/dts/r8a7792.dtsi | 5 ++
arch/arm/boot/dts/r8a7793.dtsi | 5 ++
arch/arm/boot/dts/r8a7794.dtsi | 5 ++
arch/arm/mach-shmobile/setup-r8a7778.c | 15 ----
arch/arm/mach-shmobile/setup-r8a7779.c | 27 -------
arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 +-
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 5 ++
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 5 ++
drivers/clk/renesas/clk-r8a7778.c | 26 +++---
drivers/clk/renesas/clk-r8a7779.c | 18 ++---
drivers/clk/renesas/clk-rcar-gen2.c | 32 ++++++--
drivers/clk/renesas/r8a7795-cpg-mssr.c | 8 +-
drivers/clk/renesas/r8a7796-cpg-mssr.c | 8 +-
drivers/clk/renesas/rcar-gen3-cpg.c | 17 ----
drivers/clk/renesas/rcar-gen3-cpg.h | 1 -
drivers/soc/renesas/Makefile | 5 ++
drivers/soc/renesas/rcar-rst.c | 92 ++++++++++++++++++++++
include/dt-bindings/clock/r8a7743-cpg-mssr.h | 43 ++++++++++
include/dt-bindings/clock/r8a7745-cpg-mssr.h | 44 +++++++++++
include/linux/clk/renesas.h | 4 -
include/linux/soc/renesas/rcar-rst.h | 6 ++
26 files changed, 333 insertions(+), 100 deletions(-)
create mode 100644 Documentation/devicetree/bindings/reset/renesas,rst.txt
create mode 100644 drivers/soc/renesas/rcar-rst.c
create mode 100644 include/dt-bindings/clock/r8a7743-cpg-mssr.h
create mode 100644 include/dt-bindings/clock/r8a7745-cpg-mssr.h
create mode 100644 include/linux/soc/renesas/rcar-rst.h
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-07 15:35 [git pull] clk: renesas: Updates for v4.10 (take two) Geert Uytterhoeven @ 2016-11-17 23:07 ` Stephen Boyd 2016-11-18 9:55 ` Geert Uytterhoeven 2016-11-18 9:55 ` Simon Horman 0 siblings, 2 replies; 10+ messages in thread From: Stephen Boyd @ 2016-11-17 23:07 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Michael Turquette, Simon Horman, linux-clk, linux-renesas-soc On 11/07, Geert Uytterhoeven wrote: > Hi Mike, Stephen, > > The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: > > clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 > > for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: Ok. Pulled into clk-next. I'm a little wary here as I haven't seen any indication from arm-soc maintainers (not Simon) that they'll take this cross tree merge. I guess we'll see how it goes. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-17 23:07 ` Stephen Boyd @ 2016-11-18 9:55 ` Geert Uytterhoeven 2016-11-18 9:59 ` Simon Horman 2016-11-18 9:55 ` Simon Horman 1 sibling, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2016-11-18 9:55 UTC (permalink / raw) To: Stephen Boyd, Simon Horman Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas Hi Stephen, Simon, On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > On 11/07, Geert Uytterhoeven wrote: >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: >> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 >> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: > > Ok. Pulled into clk-next. I'm a little wary here as I haven't > seen any indication from arm-soc maintainers (not Simon) that > they'll take this cross tree merge. I guess we'll see how it > goes. Thanks for pulling! Simon: while it's too late in the v4.10 cycle to queue additional cleanups in the platform code on top of this, can you please still pull git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git rcar-rst to resolve the (trivial) merge conflicts between the conversion to the RST driver in that branch, and the addition of PRR and RZ/G support in your tree? This will prevent arm-soc and/or Linus from having to deal with these conflicts. For reference, I've pushed the conflict resolution to branch renesas-devel-20161117v2-v4.9-rc5+rcar-rst Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 9:55 ` Geert Uytterhoeven @ 2016-11-18 9:59 ` Simon Horman 2016-11-18 10:12 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Simon Horman @ 2016-11-18 9:59 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Stephen Boyd, Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote: > Hi Stephen, Simon, > > On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: > > On 11/07, Geert Uytterhoeven wrote: > >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: > >> > >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 > >> > >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: > > > > Ok. Pulled into clk-next. I'm a little wary here as I haven't > > seen any indication from arm-soc maintainers (not Simon) that > > they'll take this cross tree merge. I guess we'll see how it > > goes. > > Thanks for pulling! > > Simon: while it's too late in the v4.10 cycle to queue additional cleanups in > the platform code on top of this, can you please still pull > > git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git > rcar-rst > > to resolve the (trivial) merge conflicts between the conversion to the RST > driver in that branch, and the addition of PRR and RZ/G support in your tree? > This will prevent arm-soc and/or Linus from having to deal with these > conflicts. > > For reference, I've pushed the conflict resolution to branch Pull where? I've already sent pull-requests to the ARM SoC maintainers so I fear this may be too late. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 9:59 ` Simon Horman @ 2016-11-18 10:12 ` Geert Uytterhoeven 2016-11-18 10:44 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2016-11-18 10:12 UTC (permalink / raw) To: Simon Horman Cc: Stephen Boyd, Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas Hi Simon, On Fri, Nov 18, 2016 at 10:59 AM, Simon Horman <horms@verge.net.au> wrote: > On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote: >> On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: >> > On 11/07, Geert Uytterhoeven wrote: >> >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: >> >> >> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) >> >> >> >> are available in the git repository at: >> >> >> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 >> >> >> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: >> > >> > Ok. Pulled into clk-next. I'm a little wary here as I haven't >> > seen any indication from arm-soc maintainers (not Simon) that >> > they'll take this cross tree merge. I guess we'll see how it >> > goes. >> >> Thanks for pulling! >> >> Simon: while it's too late in the v4.10 cycle to queue additional cleanups in >> the platform code on top of this, can you please still pull >> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git >> rcar-rst >> >> to resolve the (trivial) merge conflicts between the conversion to the RST >> driver in that branch, and the addition of PRR and RZ/G support in your tree? >> This will prevent arm-soc and/or Linus from having to deal with these >> conflicts. >> >> For reference, I've pushed the conflict resolution to branch > > Pull where? I've already sent pull-requests to the ARM SoC maintainers What do you mean with "where"? > so I fear this may be too late. I know you've already sent pull requests. Without a conflict resolution, the arm-soc maintainers and/or Linus will face the conflicts, depending on merge order. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 10:12 ` Geert Uytterhoeven @ 2016-11-18 10:44 ` Geert Uytterhoeven 2016-11-18 17:49 ` Olof Johansson 0 siblings, 1 reply; 10+ messages in thread From: Geert Uytterhoeven @ 2016-11-18 10:44 UTC (permalink / raw) To: Simon Horman Cc: Stephen Boyd, Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas, Arnd Bergmann, Kevin Hilman, Olof Johansson On Fri, Nov 18, 2016 at 11:12 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Fri, Nov 18, 2016 at 10:59 AM, Simon Horman <horms@verge.net.au> wrote: >> On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote: >>> On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: >>> > On 11/07, Geert Uytterhoeven wrote: >>> >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: >>> >> >>> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) >>> >> >>> >> are available in the git repository at: >>> >> >>> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 >>> >> >>> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: >>> > >>> > Ok. Pulled into clk-next. I'm a little wary here as I haven't >>> > seen any indication from arm-soc maintainers (not Simon) that >>> > they'll take this cross tree merge. I guess we'll see how it >>> > goes. >>> >>> Thanks for pulling! >>> >>> Simon: while it's too late in the v4.10 cycle to queue additional cleanups in >>> the platform code on top of this, can you please still pull >>> >>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git >>> rcar-rst >>> >>> to resolve the (trivial) merge conflicts between the conversion to the RST >>> driver in that branch, and the addition of PRR and RZ/G support in your tree? >>> This will prevent arm-soc and/or Linus from having to deal with these >>> conflicts. >>> >>> For reference, I've pushed the conflict resolution to branch >> >> Pull where? I've already sent pull-requests to the ARM SoC maintainers > > What do you mean with "where"? > >> so I fear this may be too late. > > I know you've already sent pull requests. > Without a conflict resolution, the arm-soc maintainers and/or Linus will > face the conflicts, depending on merge order. Upon second thought, any merge conflicts will show up only when Linus will merge clk and/or arm-soc branches. As the arm-soc maintainers send multiple pull requests, it's difficult to predict which merge conflicts will happen when, and providing conflict resolutions to arm-soc won't help much. After some private discussion with Simon, we think the best solution is to notify Linus in advance. All but one merge conflicts are of the "add both sides" type. I'll do so next week, before the merge window opens. Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 10:44 ` Geert Uytterhoeven @ 2016-11-18 17:49 ` Olof Johansson 2016-11-21 9:08 ` Geert Uytterhoeven 0 siblings, 1 reply; 10+ messages in thread From: Olof Johansson @ 2016-11-18 17:49 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Simon Horman, Stephen Boyd, Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas, Arnd Bergmann, Kevin Hilman On Fri, Nov 18, 2016 at 2:44 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Fri, Nov 18, 2016 at 11:12 AM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: >> On Fri, Nov 18, 2016 at 10:59 AM, Simon Horman <horms@verge.net.au> wrote: >>> On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote: >>>> On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: >>>> > On 11/07, Geert Uytterhoeven wrote: >>>> >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: >>>> >> >>>> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) >>>> >> >>>> >> are available in the git repository at: >>>> >> >>>> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 >>>> >> >>>> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: >>>> > >>>> > Ok. Pulled into clk-next. I'm a little wary here as I haven't >>>> > seen any indication from arm-soc maintainers (not Simon) that >>>> > they'll take this cross tree merge. I guess we'll see how it >>>> > goes. >>>> >>>> Thanks for pulling! >>>> >>>> Simon: while it's too late in the v4.10 cycle to queue additional cleanups in >>>> the platform code on top of this, can you please still pull >>>> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git >>>> rcar-rst >>>> >>>> to resolve the (trivial) merge conflicts between the conversion to the RST >>>> driver in that branch, and the addition of PRR and RZ/G support in your tree? >>>> This will prevent arm-soc and/or Linus from having to deal with these >>>> conflicts. >>>> >>>> For reference, I've pushed the conflict resolution to branch >>> >>> Pull where? I've already sent pull-requests to the ARM SoC maintainers >> >> What do you mean with "where"? >> >>> so I fear this may be too late. >> >> I know you've already sent pull requests. >> Without a conflict resolution, the arm-soc maintainers and/or Linus will >> face the conflicts, depending on merge order. > > Upon second thought, any merge conflicts will show up only when Linus > will merge clk and/or arm-soc branches. > > As the arm-soc maintainers send multiple pull requests, it's difficult > to predict > which merge conflicts will happen when, and providing conflict resolutions > to arm-soc won't help much. > > After some private discussion with Simon, we think the best solution is to > notify Linus in advance. All but one merge conflicts are of the "add both > sides" type. > > I'll do so next week, before the merge window opens. A few trivial merge conflicts are not a big deal, and you probably don't need to notify in advance (we always check for them when we prepare our pull requests). However, conflicts like these are an indication that your development or patch management flow isn't working quite right. You shouldn't step on your own toes like this. Try to avoid it in the future by coordinating better. -Olof ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 17:49 ` Olof Johansson @ 2016-11-21 9:08 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2016-11-21 9:08 UTC (permalink / raw) To: Olof Johansson Cc: Simon Horman, Stephen Boyd, Geert Uytterhoeven, Michael Turquette, linux-clk, Linux-Renesas, Arnd Bergmann, Kevin Hilman Hi Olof, On Fri, Nov 18, 2016 at 6:49 PM, Olof Johansson <olof@lixom.net> wrote: > On Fri, Nov 18, 2016 at 2:44 AM, Geert Uytterhoeven > <geert@linux-m68k.org> wrote: >> On Fri, Nov 18, 2016 at 11:12 AM, Geert Uytterhoeven >> <geert@linux-m68k.org> wrote: >>> On Fri, Nov 18, 2016 at 10:59 AM, Simon Horman <horms@verge.net.au> wrote: >>>> On Fri, Nov 18, 2016 at 10:55:00AM +0100, Geert Uytterhoeven wrote: >>>>> On Fri, Nov 18, 2016 at 12:07 AM, Stephen Boyd <sboyd@codeaurora.org> wrote: >>>>> > On 11/07, Geert Uytterhoeven wrote: >>>>> >> The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: >>>>> >> >>>>> >> clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) >>>>> >> >>>>> >> are available in the git repository at: >>>>> >> >>>>> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 >>>>> >> >>>>> >> for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: >>>>> > >>>>> > Ok. Pulled into clk-next. I'm a little wary here as I haven't >>>>> > seen any indication from arm-soc maintainers (not Simon) that >>>>> > they'll take this cross tree merge. I guess we'll see how it >>>>> > goes. >>>>> >>>>> Thanks for pulling! >>>>> >>>>> Simon: while it's too late in the v4.10 cycle to queue additional cleanups in >>>>> the platform code on top of this, can you please still pull >>>>> >>>>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git >>>>> rcar-rst >>>>> >>>>> to resolve the (trivial) merge conflicts between the conversion to the RST >>>>> driver in that branch, and the addition of PRR and RZ/G support in your tree? >>>>> This will prevent arm-soc and/or Linus from having to deal with these >>>>> conflicts. >>>>> >>>>> For reference, I've pushed the conflict resolution to branch >>>> >>>> Pull where? I've already sent pull-requests to the ARM SoC maintainers >>> >>> What do you mean with "where"? >>> >>>> so I fear this may be too late. >>> >>> I know you've already sent pull requests. >>> Without a conflict resolution, the arm-soc maintainers and/or Linus will >>> face the conflicts, depending on merge order. >> >> Upon second thought, any merge conflicts will show up only when Linus >> will merge clk and/or arm-soc branches. >> >> As the arm-soc maintainers send multiple pull requests, it's difficult >> to predict >> which merge conflicts will happen when, and providing conflict resolutions >> to arm-soc won't help much. >> >> After some private discussion with Simon, we think the best solution is to >> notify Linus in advance. All but one merge conflicts are of the "add both >> sides" type. >> >> I'll do so next week, before the merge window opens. > > A few trivial merge conflicts are not a big deal, and you probably > don't need to notify in advance (we always check for them when we > prepare our pull requests). OK, thanks. > However, conflicts like these are an indication that your development > or patch management flow isn't working quite right. You shouldn't step > on your own toes like this. Try to avoid it in the future by > coordinating better. This one was special, as it was about moving functionality from platform code to DT, complicated by a bad design decision when introducing DT and CCF on mach-shmobile a few years ago. Hence, the presence of the "bad" way was complicating doing it the "good" way when adding support for new SoCs. To avoid breaking existing setups, all steps had to be done in lockstep. Hence we went for the single branch. Untangling that by subsystem/maintainer would have taken 4 kernel releases. Thanks for your understanding! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-17 23:07 ` Stephen Boyd 2016-11-18 9:55 ` Geert Uytterhoeven @ 2016-11-18 9:55 ` Simon Horman 2016-11-18 9:58 ` Simon Horman 1 sibling, 1 reply; 10+ messages in thread From: Simon Horman @ 2016-11-18 9:55 UTC (permalink / raw) To: Stephen Boyd Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, linux-renesas-soc On Thu, Nov 17, 2016 at 03:07:01PM -0800, Stephen Boyd wrote: > On 11/07, Geert Uytterhoeven wrote: > > Hi Mike, Stephen, > > > > The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: > > > > clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 > > > > for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: > > Ok. Pulled into clk-next. I'm a little wary here as I haven't > seen any indication from arm-soc maintainers (not Simon) that > they'll take this cross tree merge. I guess we'll see how it > goes. Thanks. It looks like it has been accepted by the ARM SoC maintainers. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [git pull] clk: renesas: Updates for v4.10 (take two) 2016-11-18 9:55 ` Simon Horman @ 2016-11-18 9:58 ` Simon Horman 0 siblings, 0 replies; 10+ messages in thread From: Simon Horman @ 2016-11-18 9:58 UTC (permalink / raw) To: Stephen Boyd Cc: Geert Uytterhoeven, Michael Turquette, linux-clk, linux-renesas-soc On Fri, Nov 18, 2016 at 10:55:37AM +0100, Simon Horman wrote: > On Thu, Nov 17, 2016 at 03:07:01PM -0800, Stephen Boyd wrote: > > On 11/07, Geert Uytterhoeven wrote: > > > Hi Mike, Stephen, > > > > > > The following changes since commit dbdcc4f996df280eb2758095b4774ea62da8a2a7: > > > > > > clk: renesas: r8a7796: Add DU and LVDS clocks (2016-11-02 20:40:08 +0100) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/clk-renesas-for-v4.10-tag2 > > > > > > for you to fetch changes up to 1936be95e013802291201c1ed193e04fd1ed3d13: > > > > Ok. Pulled into clk-next. I'm a little wary here as I haven't > > seen any indication from arm-soc maintainers (not Simon) that > > they'll take this cross tree merge. I guess we'll see how it > > goes. > > Thanks. It looks like it has been accepted by the ARM SoC maintainers. Oopps, I spoke too soon. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-11-21 9:08 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-07 15:35 [git pull] clk: renesas: Updates for v4.10 (take two) Geert Uytterhoeven 2016-11-17 23:07 ` Stephen Boyd 2016-11-18 9:55 ` Geert Uytterhoeven 2016-11-18 9:59 ` Simon Horman 2016-11-18 10:12 ` Geert Uytterhoeven 2016-11-18 10:44 ` Geert Uytterhoeven 2016-11-18 17:49 ` Olof Johansson 2016-11-21 9:08 ` Geert Uytterhoeven 2016-11-18 9:55 ` Simon Horman 2016-11-18 9:58 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).