| Message ID | cover.1387893834.git.horms+renesas@verge.net.au |
|---|---|
| State | New |
| Headers | show |
Hi Sergei and Simon, On Tuesday 24 December 2013 20:00:43 Sergei Shtylyov wrote: > On 24-12-2013 18:19, Simon Horman wrote: > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > Now that the DTS file r8a7790-koelsch.dts can be used with > > board-koelsch.c and board-koelsch-reference.c, proceed with removing > > r8a7790-koelsch-reference.dts. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > --- > > > > arch/arm/boot/dts/Makefile | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > index 909d910..5839077 100644 > > --- a/arch/arm/boot/dts/Makefile > > +++ b/arch/arm/boot/dts/Makefile > > @@ -225,7 +225,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb > > \ > > r8a7779-marzen.dtb \ > > r8a7779-marzen-reference.dtb \ > > r8a7791-koelsch.dtb \ > > - r8a7791-koelsch-reference.dtb \ > > r8a7790-lager.dtb \ > > r8a7790-lager-reference.dtb \ > > Hm, the previous commit removed that file itself but forgot to remove it > from the Makefile. Indeed, this problem doesn't seem to be present in the patches I've sent. Simon, has something gone wrong during a rebase ? > > sh73a0-kzm9g.dtb \ > > I suspect this patch should have removed the *.dts fiel itself but failed to > do so...
On Thu, Dec 26, 2013 at 03:48:58PM +0100, Laurent Pinchart wrote: > Hi Sergei and Simon, > > On Tuesday 24 December 2013 20:00:43 Sergei Shtylyov wrote: > > On 24-12-2013 18:19, Simon Horman wrote: > > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > > > Now that the DTS file r8a7790-koelsch.dts can be used with > > > board-koelsch.c and board-koelsch-reference.c, proceed with removing > > > r8a7790-koelsch-reference.dts. > > > > > > Signed-off-by: Laurent Pinchart > > > <laurent.pinchart+renesas@ideasonboard.com> > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > --- > > > > > > arch/arm/boot/dts/Makefile | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > > index 909d910..5839077 100644 > > > --- a/arch/arm/boot/dts/Makefile > > > +++ b/arch/arm/boot/dts/Makefile > > > @@ -225,7 +225,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb > > > \ > > > r8a7779-marzen.dtb \ > > > r8a7779-marzen-reference.dtb \ > > > r8a7791-koelsch.dtb \ > > > - r8a7791-koelsch-reference.dtb \ > > > r8a7790-lager.dtb \ > > > r8a7790-lager-reference.dtb \ > > > > Hm, the previous commit removed that file itself but forgot to remove it > > from the Makefile. > > Indeed, this problem doesn't seem to be present in the patches I've sent. > Simon, has something gone wrong during a rebase ? Sorry about that. Could you supply an incremental patch to remove the file itself?
Hi Simon, On Friday 27 December 2013 11:23:57 Simon Horman wrote: > On Thu, Dec 26, 2013 at 03:48:58PM +0100, Laurent Pinchart wrote: > > On Tuesday 24 December 2013 20:00:43 Sergei Shtylyov wrote: > > > On 24-12-2013 18:19, Simon Horman wrote: > > > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > > > > > Now that the DTS file r8a7790-koelsch.dts can be used with > > > > board-koelsch.c and board-koelsch-reference.c, proceed with removing > > > > r8a7790-koelsch-reference.dts. > > > > > > > > Signed-off-by: Laurent Pinchart > > > > <laurent.pinchart+renesas@ideasonboard.com> > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > --- > > > > > > > > arch/arm/boot/dts/Makefile | 1 - > > > > 1 file changed, 1 deletion(-) > > > > > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > > > index 909d910..5839077 100644 > > > > --- a/arch/arm/boot/dts/Makefile > > > > +++ b/arch/arm/boot/dts/Makefile > > > > @@ -225,7 +225,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += > > > > emev2-kzm9d.dtb > > > > \ > > > > > > > > r8a7779-marzen.dtb \ > > > > r8a7779-marzen-reference.dtb \ > > > > r8a7791-koelsch.dtb \ > > > > > > > > - r8a7791-koelsch-reference.dtb \ > > > > > > > > r8a7790-lager.dtb \ > > > > r8a7790-lager-reference.dtb \ > > > > > > Hm, the previous commit removed that file itself but forgot to remove it > > > from the Makefile. > > > > Indeed, this problem doesn't seem to be present in the patches I've sent. > > Simon, has something gone wrong during a rebase ? > > Sorry about that. > > Could you supply an incremental patch to remove the file itself? Sure. I've sent the patch. Could you please also pick "[PATCH v6 15.1/17] ARM: shmobile: Add GPIO keys to Koelsch DTS" from the list ?
On Tue, Dec 24, 2013 at 11:19:23PM +0900, Simon Horman wrote: > Hi Kevin, Hi Olof, Hi Arnd, > > please consider this third round of Renesas ARM based SoC DT updates for v3.14. > > This is based on a merge of: > > * The second round of Renesas ARM based SoC DT updates for v3.14, > tagged as renesas-dt2-for-v3.14, which I have previously sent a > pull-request for. > > * The second round of Renesas ARM based SoC updates for v3.14, > tagged as renesas-soc2-for-v3.14, which I have previously sent a > pull-request for. > > * The clk-next-shmobile branch of Mike Turquette's tree > > * The clockevents/for-Simon-3.13-rc2 branch of Daniel Lezcano's tree > > * The pinctl/for-next branch of Linus Walleij's tree > > * v3.13-rc3 Ah, here's the missing clk branch that caused earlier merges not to build. Please provide actual URLs for the external branches since we want to track them. I can't reverse-engineer them since you use remotes instead of the URL when you merged in, unfortunately. (No need to redo the pull request, just give me the URLs, please. > The reason for these merges is to provide dependencies for > the clock updates for the r8a7791 (R-Car M2) based Koelsch and r8a7790 > (R-Car H2) based Lager boards. > > > The following changes since commit b652896b02df3dfde3a68957cce01f2aa4585842: > > ARM: shmobile: r8a7791: Add SSI clocks in device tree (2013-12-24 23:01:13 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.14 Pulled, thanks. -Olof
On Thu, Jan 02, 2014 at 10:49:39AM -0800, Olof Johansson wrote: > On Tue, Dec 24, 2013 at 11:19:23PM +0900, Simon Horman wrote: > > Hi Kevin, Hi Olof, Hi Arnd, > > > > please consider this third round of Renesas ARM based SoC DT updates for v3.14. > > > > This is based on a merge of: > > > > * The second round of Renesas ARM based SoC DT updates for v3.14, > > tagged as renesas-dt2-for-v3.14, which I have previously sent a > > pull-request for. > > > > * The second round of Renesas ARM based SoC updates for v3.14, > > tagged as renesas-soc2-for-v3.14, which I have previously sent a > > pull-request for. > > > > * The clk-next-shmobile branch of Mike Turquette's tree git://git.linaro.org/people/mike.turquette/linux.git clk-next-shmobile > > > > * The clockevents/for-Simon-3.13-rc2 branch of Daniel Lezcano's tree git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/for-Simon-3.13-rc2 > > * The pinctl/for-next branch of Linus Walleij's tree git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctl/for-next > > > > * v3.13-rc3 > > Ah, here's the missing clk branch that caused earlier merges not to build. Yes, sorry about that. > Please provide actual URLs for the external branches since we want to > track them. I can't reverse-engineer them since you use remotes instead > of the URL when you merged in, unfortunately. > > (No need to redo the pull request, just give me the URLs, please. Sorry about that. Is the information I have added above sufficient? > > The reason for these merges is to provide dependencies for > > the clock updates for the r8a7791 (R-Car M2) based Koelsch and r8a7790 > > (R-Car H2) based Lager boards. > > > > > > The following changes since commit b652896b02df3dfde3a68957cce01f2aa4585842: > > > > ARM: shmobile: r8a7791: Add SSI clocks in device tree (2013-12-24 23:01:13 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.14 > > Pulled, thanks. > > > -Olof >
On Sat, Jan 04, 2014 at 08:42:38AM +0900, Simon Horman wrote: > On Thu, Jan 02, 2014 at 10:49:39AM -0800, Olof Johansson wrote: > > On Tue, Dec 24, 2013 at 11:19:23PM +0900, Simon Horman wrote: > > > Hi Kevin, Hi Olof, Hi Arnd, > > > > > > please consider this third round of Renesas ARM based SoC DT updates for v3.14. > > > > > > This is based on a merge of: > > > > > > * The second round of Renesas ARM based SoC DT updates for v3.14, > > > tagged as renesas-dt2-for-v3.14, which I have previously sent a > > > pull-request for. > > > > > > * The second round of Renesas ARM based SoC updates for v3.14, > > > tagged as renesas-soc2-for-v3.14, which I have previously sent a > > > pull-request for. > > > > > > * The clk-next-shmobile branch of Mike Turquette's tree > > git://git.linaro.org/people/mike.turquette/linux.git clk-next-shmobile > > > > > > > * The clockevents/for-Simon-3.13-rc2 branch of Daniel Lezcano's tree > > git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/for-Simon-3.13-rc2 > > > > * The pinctl/for-next branch of Linus Walleij's tree > > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctl/for-next > > > > > > > * v3.13-rc3 > > > > Ah, here's the missing clk branch that caused earlier merges not to build. > > Yes, sorry about that. > > > Please provide actual URLs for the external branches since we want to > > track them. I can't reverse-engineer them since you use remotes instead > > of the URL when you merged in, unfortunately. > > > > (No need to redo the pull request, just give me the URLs, please. > > Sorry about that. Is the information I have added above sufficient? Yep, thanks! Since the branches both come from parties that we normally share branches with. I've cc:d them on this reply as well. The only branch that isn't optimal is that it pulls in all of for-next from the pinctrl tree, but it's OK for that tree in general. Having a dedicated topic branch makes it a little harder to forget and accidentally rebase. Note that it's pretty much ideal for us to be cc:d into the three-way handshake that the remote branch will be guaranteed to be stable. The last thing we want is that some of these people didn't quite understand what we need w.r.t. stability (that has happened in the past). Especially if they feed their branches up to another maintainer above them. I'll merge in the dt3 branch with the above three as external dependency branches. -Olof
On Sun, Dec 29, 2013 at 10:42:02PM +0100, Laurent Pinchart wrote: > Hi Simon, > > On Friday 27 December 2013 11:23:57 Simon Horman wrote: > > On Thu, Dec 26, 2013 at 03:48:58PM +0100, Laurent Pinchart wrote: > > > On Tuesday 24 December 2013 20:00:43 Sergei Shtylyov wrote: > > > > On 24-12-2013 18:19, Simon Horman wrote: > > > > > From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > > > > > > > > > > Now that the DTS file r8a7790-koelsch.dts can be used with > > > > > board-koelsch.c and board-koelsch-reference.c, proceed with removing > > > > > r8a7790-koelsch-reference.dts. > > > > > > > > > > Signed-off-by: Laurent Pinchart > > > > > <laurent.pinchart+renesas@ideasonboard.com> > > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > > --- > > > > > > > > > > arch/arm/boot/dts/Makefile | 1 - > > > > > 1 file changed, 1 deletion(-) > > > > > > > > > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > > > > > index 909d910..5839077 100644 > > > > > --- a/arch/arm/boot/dts/Makefile > > > > > +++ b/arch/arm/boot/dts/Makefile > > > > > @@ -225,7 +225,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += > > > > > emev2-kzm9d.dtb > > > > > \ > > > > > > > > > > r8a7779-marzen.dtb \ > > > > > r8a7779-marzen-reference.dtb \ > > > > > r8a7791-koelsch.dtb \ > > > > > > > > > > - r8a7791-koelsch-reference.dtb \ > > > > > > > > > > r8a7790-lager.dtb \ > > > > > r8a7790-lager-reference.dtb \ > > > > > > > > Hm, the previous commit removed that file itself but forgot to remove it > > > > from the Makefile. > > > > > > Indeed, this problem doesn't seem to be present in the patches I've sent. > > > Simon, has something gone wrong during a rebase ? > > > > Sorry about that. > > > > Could you supply an incremental patch to remove the file itself? > > Sure. I've sent the patch. Thanks, got it. > Could you please also pick "[PATCH v6 15.1/17] ARM: > shmobile: Add GPIO keys to Koelsch DTS" from the list ? Done.