Message ID | 1370591517-20239-1-git-send-email-horms+renesas@verge.net.au |
---|---|
State | New |
Headers | show |
Hello. On 07-06-2013 11:51, Simon Horman wrote: > From: Bastian Hecht <hechtb@gmail.com> > When we use the ethernet device via DT setup, we need to add it > to a lookup list until this is properly handled later in a DT-only > fashion. > Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > --- > arch/arm/mach-shmobile/clock-r8a7740.c | 1 + > 1 file changed, 1 insertion(+) > diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c > index 54afa04..008b11c 100644 > --- a/arch/arm/mach-shmobile/clock-r8a7740.c > +++ b/arch/arm/mach-shmobile/clock-r8a7740.c > @@ -592,6 +592,7 @@ static struct clk_lookup lookups[] = { > CLKDEV_DEV_ID("sh_mmcif", &mstp_clks[MSTP312]), > CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), > CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP309]), > + CLKDEV_DEV_ID("e9a00000.sh-eth", &mstp_clks[MSTP309]), I don't quite understand why this is needed. There's no device tree support for the 'sh_eth' driver yet. Oh well... WBR, Sergei
Hi Simon, On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: > > Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 Thanks a lot for reshuffling the patches into the categories we use! For future cases, if you want to split off the cleanups you can do that as a separate branch, and use that branch as a base for feature branches. Either way works, sometimes it's nice to see cleanups separated out but it all depends on volumes, etc. Pulled into next/soc. -Olof
On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote: > Hi Simon, > > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote: >> Hi Olof, Hi Arnd, >> >> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: >> >> Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 > > Thanks a lot for reshuffling the patches into the categories we use! > > For future cases, if you want to split off the cleanups you can do that as > a separate branch, and use that branch as a base for feature branches. Either > way works, sometimes it's nice to see cleanups separated out but it all depends > on volumes, etc. > > > Pulled into next/soc. Actually, I just noticed that this caused a few conflicts with the pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio branch into next/soc instead of next/drivers where it was earlier. Please also check my conflict resolution once the branch has been pushed out. Thanks, -Olof
On Tue, Jun 11, 2013 at 12:19:25AM -0700, Olof Johansson wrote: > Hi Simon, > > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote: > > Hi Olof, Hi Arnd, > > > > The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: > > > > Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 > > Thanks a lot for reshuffling the patches into the categories we use! > > For future cases, if you want to split off the cleanups you can do that as > a separate branch, and use that branch as a base for feature branches. Either > way works, sometimes it's nice to see cleanups separated out but it all depends > on volumes, etc. Thanks. In this case I think it would have worked well to have soc depend on cleanups. I'll keep that in mind for next time. > Pulled into next/soc. > > > > -Olof >
On Tue, Jun 11, 2013 at 12:23:40AM -0700, Olof Johansson wrote: > On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote: > > Hi Simon, > > > > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote: > >> Hi Olof, Hi Arnd, > >> > >> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: > >> > >> Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) > >> > >> are available in the git repository at: > >> > >> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 > > > > Thanks a lot for reshuffling the patches into the categories we use! > > > > For future cases, if you want to split off the cleanups you can do that as > > a separate branch, and use that branch as a base for feature branches. Either > > way works, sometimes it's nice to see cleanups separated out but it all depends > > on volumes, etc. > > > > > > Pulled into next/soc. > > Actually, I just noticed that this caused a few conflicts with the > pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio > branch into next/soc instead of next/drivers where it was earlier. > Please also check my conflict resolution once the branch has been > pushed out. Thanks. I have checked and your conflict resolution is the same as mine. This is an issue that I'm not entirely clear on the best practice for. Is it sufficient for me to note any conflicts in the pull-request, or in future should I re-arrange things somehow?
On Tue, Jun 11, 2013 at 1:01 AM, Simon Horman <horms@verge.net.au> wrote: > On Tue, Jun 11, 2013 at 12:23:40AM -0700, Olof Johansson wrote: >> On Tue, Jun 11, 2013 at 12:19 AM, Olof Johansson <olof@lixom.net> wrote: >> > Hi Simon, >> > >> > On Fri, Jun 07, 2013 at 04:51:30PM +0900, Simon Horman wrote: >> >> Hi Olof, Hi Arnd, >> >> >> >> The following changes since commit c7788792a5e7b0d5d7f96d0766b4cb6112d47d75: >> >> >> >> Linux 3.10-rc2 (2013-05-20 14:37:38 -0700) >> >> >> >> are available in the git repository at: >> >> >> >> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 >> > >> > Thanks a lot for reshuffling the patches into the categories we use! >> > >> > For future cases, if you want to split off the cleanups you can do that as >> > a separate branch, and use that branch as a base for feature branches. Either >> > way works, sometimes it's nice to see cleanups separated out but it all depends >> > on volumes, etc. >> > >> > >> > Pulled into next/soc. >> >> Actually, I just noticed that this caused a few conflicts with the >> pinmux-gpio branch you sent earlier. So I've moved said pinmux/gpio >> branch into next/soc instead of next/drivers where it was earlier. >> Please also check my conflict resolution once the branch has been >> pushed out. > > Thanks. I have checked and your conflict resolution is the same as mine. > > This is an issue that I'm not entirely clear on the best practice for. > Is it sufficient for me to note any conflicts in the pull-request, > or in future should I re-arrange things somehow? It's always good to get a heads up that there will be conflicts. Simple conflicts like these are perfectly fine to expose though. It's sometimes good to get a reference resolution of them from you -- for example in this case I had originally resolved the conflict differently from you in your version of the merge (that was part of the boards branch), so I had to go back and redo it to not cause extra conflicts there. -Olof