From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL v2 00/27] Renesas ARM-based SoC updates for v3.11
Date: Tue, 11 Jun 2013 08:01:19 +0000 [thread overview]
Message-ID: <20130611080119.GC5300@verge.net.au> (raw)
In-Reply-To: <CAOesGMjDGkWO9YEqocv1ZFtDaaUPfoRMJNPEty6E3UDcGTeKew@mail.gmail.com>
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?
next prev parent reply other threads:[~2013-06-11 8:01 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-07 7:51 [GIT PULL v2 00/27] Renesas ARM-based SoC updates for v3.11 Simon Horman
2013-06-07 7:51 ` [PATCH 01/27] ARM: shmobile: r8a7740: Make private clock arrays static Simon Horman
2013-06-07 7:51 ` [PATCH 02/27] ARM: shmobile: r8a7778: correct model name in Kconfig Simon Horman
2013-06-07 7:51 ` [PATCH 03/27] ARM: shmobile: sh73a0: Use DEFINE_RES_MEM*() everywhere Simon Horman
2013-06-07 7:51 ` [PATCH 04/27] ARM: shmobile: remove ";" from SH_FIXED_RATIO_CLK*() macro Simon Horman
2013-06-07 7:51 ` [PATCH 05/27] ARM: shmobile: use do{ }while() on SH_CLK_SET_RATIO() Simon Horman
2013-06-07 7:51 ` [PATCH 06/27] ARM: shmobile: r8a7778: fixup Ether setup code position Simon Horman
2013-06-07 7:51 ` [PATCH 07/27] ARM: shmobile: r8a7740: Add interim sh-eth device name to clocks list Simon Horman
2013-06-07 11:30 ` Sergei Shtylyov
2013-06-07 7:51 ` [PATCH 08/27] ARM: shmobile: r8a7740: Add I2C DT clock names Simon Horman
2013-06-07 7:51 ` [PATCH 09/27] ARM: shmobile: r8a7740: add TPU PWM support Simon Horman
2013-06-07 7:51 ` [PATCH 10/27] ARM: shmobile: r8a73a4: add main clock Simon Horman
2013-06-07 7:51 ` [PATCH 11/27] ARM: shmobile: r8a73a4: add pll clocks Simon Horman
2013-06-07 7:51 ` [PATCH 12/27] ARM: shmobile: r8a73a4: add div4 clocks Simon Horman
2013-06-07 7:51 ` [PATCH 13/27] ARM: shmobile: r8a73a4: add div6 clocks Simon Horman
2013-06-07 7:51 ` [PATCH 14/27] ARM: shmobile: r8a7779: Add PCIe clocks Simon Horman
2013-06-07 7:51 ` [PATCH 15/27] ARM: shmobile: r8a7778: use fixed ratio clock Simon Horman
2013-06-07 7:51 ` [PATCH 16/27] ARM: shmobile: r8a7778: add SDHI clock support Simon Horman
2013-06-07 7:51 ` [PATCH 17/27] ARM: shmobile: r8a7778: Register SDHI device Simon Horman
2013-06-07 7:51 ` [PATCH 18/27] ARM: shmobile: r8a7790: add main clock Simon Horman
2013-06-07 7:51 ` [PATCH 19/27] ARM: shmobile: r8a7790: add div4 clocks Simon Horman
2013-06-07 7:51 ` [PATCH 20/27] ARM: shmobile: r8a7790: add div6 clocks Simon Horman
2013-06-07 7:51 ` [PATCH 21/27] ARM: shmobile: r8a7790: Make private clock arrays static Simon Horman
2013-06-07 7:51 ` [PATCH 22/27] ARM: shmobile: r8a7790: add TPU PWM support Simon Horman
2013-06-07 7:51 ` [PATCH 23/27] ARM: shmobile: sh73a0: add support for adjusting CPU frequency Simon Horman
2013-06-07 7:51 ` [PATCH 24/27] ARM: shmobile: sh73a0: add CPUFreq support Simon Horman
2013-06-07 7:51 ` [PATCH 25/27] ARM: shmobile: sh73a0: Always use shmobile_setup_delay() Simon Horman
2013-06-07 7:51 ` [PATCH 26/27] ARM: shmobile: sh73a0: do not overwrite all div4 clock operations Simon Horman
2013-06-07 7:51 ` [PATCH 27/27] ARM: shmobile: sh73a0: div4 clocks must check the kick bit before changing rate Simon Horman
2013-06-11 7:19 ` [GIT PULL v2 00/27] Renesas ARM-based SoC updates for v3.11 Olof Johansson
2013-06-11 7:23 ` Olof Johansson
2013-06-11 8:01 ` Simon Horman [this message]
2013-06-11 8:12 ` Olof Johansson
2013-06-11 7:31 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130611080119.GC5300@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).