From: Olof Johansson <olof@lixom.net>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] Renesas ARM Based SoC r8a73a4 CCF and Multiplatform Updates for v4.1
Date: Wed, 01 Apr 2015 23:32:11 +0000 [thread overview]
Message-ID: <20150401233211.GB8137@localhost> (raw)
In-Reply-To: <cover.1425517246.git.horms+renesas@verge.net.au>
On Thu, Mar 05, 2015 at 10:57:57AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC r8a73a4 CCF and multiplatform
> updates for v4.1.
>
>
> This pull request is based on "Renesas ARM Based SoC Simple PM Bus Updates
> for v4.1", tagged as renesas-simple-pm-bus-for-v4.1, which you have already
> pulled. That pull request provides run-time dependencies for this one.
>
>
> This pull requests has minor conflicts with "Renesas ARM Based SoC sh7372
> SoC Removal Updates for v4.1", tagged as
> renesas-sh7372-soc-removal-for-v4.1, which you have already pulled.
>
> The conflicts are in the following files:
> arch/arm/mach-shmobile/Kconfig
> arch/arm/mach-shmobile/Makefile
>
> The solution is to delete both.
>
> This solution can be found in the renesas-next-20150305v2-v4.0-rc1 tag of
> the renesas tree.
>
>
> The following changes since commit 89d463ea106dba530786a2815fd174f9e6eab71f:
>
> drivers: bus: Add Simple Power-Managed Bus Driver (2015-02-24 06:36:18 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r8a73a4-ccf-and-multiplatform-for-v4.1
>
> for you to fetch changes up to 914d7d148411997c2f76f689338d27c362300b7a:
>
> ARM: shmobile: r8a73a4: Remove legacy code (2015-02-25 16:14:02 +0900)
Thanks, merged.
I don't see a reason for you to split your branches per SoC like this
though -- you already had another multiplatform branch for another SoC,
you can combine the two.
-Olof
next prev parent reply other threads:[~2015-04-01 23:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-29 4:59 [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Simon Horman
2014-10-29 4:59 ` [PATCH 1/4] ARM: shmobile: r8a73a4: Add CMT1 node Simon Horman
2014-10-29 4:59 ` [PATCH 2/4] ARM: shmobile: r8a73a4: Rename cmt registration helper Simon Horman
2014-10-29 4:59 ` [PATCH 3/4] ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT Simon Horman
2014-10-29 4:59 ` [PATCH 4/4] ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices Simon Horman
2014-11-04 22:39 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19 Olof Johansson
2015-03-05 1:57 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 CCF and Multiplatform Updates for v4.1 Simon Horman
2015-03-05 1:57 ` [PATCH 01/13] ARM: shmobile: r8a73a4: Add CPG register bits header Simon Horman
2015-03-05 1:57 ` [PATCH 02/13] ARM: shmobile: r8a73a4: Common clock framework DT description Simon Horman
2015-03-05 1:57 ` [PATCH 03/13] ARM: shmobile: ape6evm: Disable legacy clock initialization Simon Horman
2015-03-05 1:57 ` [PATCH 04/13] ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT Simon Horman
2015-03-05 1:57 ` [PATCH 05/13] ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node Simon Horman
2015-03-05 1:57 ` [PATCH 06/13] ARM: shmobile: ape6evm dts: Move Ethernet node to BSC Simon Horman
2015-03-05 1:57 ` [PATCH 07/13] ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug Simon Horman
2015-03-05 1:58 ` [PATCH 08/13] ARM: shmobile: ape6evm-reference: Remove board C code and DT file Simon Horman
2015-03-05 1:58 ` [PATCH 09/13] ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform Simon Horman
2015-03-05 1:58 ` [PATCH 10/13] ARM: shmobile: ape6evm dts: Drop console= bootargs parameter Simon Horman
2015-03-05 1:58 ` [PATCH 11/13] PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding Simon Horman
2015-03-05 1:58 ` [PATCH 12/13] ARM: shmobile: r8a73a4 dtsi: Add PM domain support Simon Horman
2015-03-05 1:58 ` [PATCH 13/13] ARM: shmobile: r8a73a4: Remove legacy code Simon Horman
2015-04-01 23:32 ` Olof Johansson [this message]
2015-04-02 0:21 ` [GIT PULL] Renesas ARM Based SoC r8a73a4 CCF and Multiplatform Updates for v4.1 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=20150401233211.GB8137@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).