From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM-based SoC: SoC for 3.7
Date: Wed, 12 Sep 2012 16:20:30 +0900 [thread overview]
Message-ID: <20120912072030.GD8435@verge.net.au> (raw)
In-Reply-To: <CAOesGMgCK=1f4NnJab+uDcGtKtbwuESK0SEPeJefHteuprMB-A@mail.gmail.com>
On Tue, Sep 11, 2012 at 10:55:47PM -0700, Olof Johansson wrote:
> Hi,
>
> On Mon, Sep 10, 2012 at 9:51 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Sat, Sep 08, 2012 at 09:10:26AM +0900, Simon Horman wrote:
> >> On Fri, Sep 07, 2012 at 02:49:51PM -0700, Olof Johansson wrote:
> >> > Hi,
> >> >
> >> > On Thu, Sep 06, 2012 at 11:02:07AM +0900, Simon Horman wrote:
> >> > > Hi Olof, Hi Arnd,
> >> > >
> >> > > please consider the following SoC enhancement from
> >> > > Phil Edworthy for inclusion in 3.7.
> >> > >
> >> > > ----------------------------------------------------------------
> >> > > The following changes since commit 7952717adb69efc1d2443a1858f96d23c2fb93e0:
> >> > >
> >> > > ARM: shmobile: kzm9g: enable restarting (2012-08-25 14:39:44 +0900)
> >> > >
> >> > > are available in the git repository at:
> >> > >
> >> > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc
> >> >
> >> > The above is based on the previous branch we pulled from you (kzm9g), and
> >> > contains a patch to support rebooting of a board. I would have expected that to
> >> > be the base for your board branch but not the SoC branch.
> >> >
> >> > Did you mean to base them like this for some other reason that I didn't
> >> > realize, or would you mind switching the two branches so that the board
> >> > one includes the restart change but not the other way around?
> >>
> >> Sorry about that, I'll switch things around.
> >
> > Hi Olof,
> >
> > I was going to switch things around as you suggest, but I noticed
> > that the reason that I did things this way is that my kzm9g branch
> > was pulled into the next/soc branch of the arm-soc tree (commit
> > 301fd5c13257862df66c81c48d963d474e63e0ef).
>
> Ah, gotcha, and also noticing my own slight confusion here.
>
> First, since there's no overlap with the old and the new branch,
> there's no need to base them on each other (since they won't cause
> merge conflicts, and order of merging them in doesn't have other
> dependencies either).
>
> But it also makes sense from your development point of view to stack
> them, since that's how you'll end up building up the branches anyway.
> So:
>
> > With that in mind, do you want to take this pull-request as is?
>
> Nah, no need, sorry for the confusion. I'll pull it in as it is into next/soc.
Thanks!
prev parent reply other threads:[~2012-09-12 7:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 2:02 [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Simon Horman
2012-09-06 2:02 ` [PATCH] r8a7779: add SDHI clock support Simon Horman
2012-09-07 21:49 ` [GIT PULL] Renesas ARM-based SoC: SoC for 3.7 Olof Johansson
2012-09-08 0:10 ` Simon Horman
2012-09-11 4:51 ` Simon Horman
2012-09-12 5:55 ` Olof Johansson
2012-09-12 7:20 ` Simon Horman [this message]
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=20120912072030.GD8435@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).