From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/2] Broadcom SoC changes for v4.4 (part 2)
Date: Fri, 23 Oct 2015 11:02:38 -0700 [thread overview]
Message-ID: <20151023180238.GD18961@localhost> (raw)
In-Reply-To: <1445280190-8812-1-git-send-email-f.fainelli@gmail.com>
Hi Florian,
On Mon, Oct 19, 2015 at 11:43:09AM -0700, Florian Fainelli wrote:
> The following changes since commit c4a8ea9e0698945b182ba1e1063a0981b1f35139:
>
> ARM: brcmstb: Setup BIU control registers during boot (2015-10-09 13:42:18 -0700)
>
> are available in the git repository at:
>
> http://github.com/Broadcom/stblinux tags/arm-soc/for-4.4/soc-part2
>
> for you to fetch changes up to d0317a5d496dfac6d11e281d61b7aae0d4192e81:
>
> ARM: bcm2835: Add the Raspberry Pi firmware driver (2015-10-19 11:08:40 -0700)
I see this merge window has been a touch confusing on the broadcom side, and we
should probably have pointed this out sooner:
We normally prefer to separate out arch/arm/mach* changes as the usual soc
changes, and keep drivers/soc and other drivers/* changes in separate branches,
usually merged through our 'drivers' branch instead.
I don't see what's "SoC" about the patch in this branch, and I don't think it's
dependent on the other contents in previous SoC branches. So let's merge this
as a separate driver branch, if that's ok?
In other words, please send a new pull request that contains this without the
SoC base, and we'll merge it through our next/drivers. Or, if you prefer, I
can cherry-pick it out myself. I'll leave the choice up to you and what works
for you in your workflow.
-Olof
next prev parent reply other threads:[~2015-10-23 18:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 18:43 [GIT PULL 2/2] Broadcom SoC changes for v4.4 (part 2) Florian Fainelli
2015-10-19 18:43 ` [GIT PULL 1/2] Broadcom Device Tree changes for 4.4 " Florian Fainelli
2015-10-23 18:26 ` Olof Johansson
2015-10-23 19:32 ` Florian Fainelli
2015-10-23 19:42 ` Olof Johansson
2015-10-23 18:02 ` Olof Johansson [this message]
2015-10-23 18:45 ` [GIT PULL 2/2] Broadcom SoC changes for v4.4 " Florian Fainelli
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=20151023180238.GD18961@localhost \
--to=olof@lixom.net \
--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).