From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM Based SoC sh73a0 Multiplatform Updates for v4.1
Date: Wed, 1 Apr 2015 16:38:59 -0700 [thread overview]
Message-ID: <20150401233859.GC8137@localhost> (raw)
In-Reply-To: <cover.1425518682.git.horms+renesas@verge.net.au>
On Thu, Mar 05, 2015 at 10:58:26AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC sh73a0 multiplatform updates for v4.1.
>
> This pull request is based on the previous round of
> such requests, tagged as sh73a0-multiplatform-for-v4.1.base,
> which I have already sent a pull-request for.
>
>
> This pull request is based on a merge of the following pull requests
> which you have already pulled:
>
> * "Renesas ARM Based SoC Simple PM Bus Updates for v4.1",
> tagged as renesas-simple-pm-bus-for-v4.1.
>
> * "Renesas ARM Based SoC DT Updates for v4.1", tagged as renesas-dt-for-v4.1.
>
>
> This pull requests has a number of 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/boot/dts/Makefile
> arch/arm/mach-shmobile/Makefile
> arch/arm/mach-shmobile/Makefile.boot
> arch/arm/mach-shmobile/include/mach/zboot.h
It'd be nice to keep the dts changes in your DT branch, so there's less risk
for add/remove conflicts. I don't think there will be any this release so it's
not a big deal, but keep it in mind in the future.
Also, as already mentioned, some of this could have gone in one larger joined
branch (and based on the cleanups to avoid conflicts).
-Olof
prev parent reply other threads:[~2015-04-01 23:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 1:58 [GIT PULL] Renesas ARM Based SoC sh73a0 Multiplatform Updates for v4.1 Simon Horman
2015-03-05 1:58 ` [PATCH 01/11] ARM: shmobile: sh73a0: Introduce generic setup callback Simon Horman
2015-03-05 1:58 ` [PATCH 02/11] ARM: shmobile: sh73a0: Add Multiplatform support Simon Horman
2015-03-05 1:58 ` [PATCH 03/11] ARM: shmobile: kzm9g dts: Sync with kzm9g-reference dts Simon Horman
2015-03-05 1:58 ` [PATCH 04/11] ARM: shmobile: kzm9g: Build DTS for Multiplatform Simon Horman
2015-03-05 1:58 ` [PATCH 05/11] ARM: shmobile: sh73a0 dtsi: Add Bus State Controller node Simon Horman
2015-03-05 1:58 ` [PATCH 06/11] ARM: shmobile: kzm9g dts: Move Ethernet node to BSC Simon Horman
2015-03-05 1:58 ` [PATCH 07/11] ARM: shmobile: kzm9g-reference: Remove board C code and DT file Simon Horman
2015-03-05 1:58 ` [PATCH 08/11] ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node Simon Horman
2015-03-05 1:58 ` [PATCH 09/11] ARM: shmobile: sh73a0: Remove unused sh73a0_add_standard_devices_dt() Simon Horman
2015-03-05 1:58 ` [PATCH 10/11] ARM: shmobile: sh73a0 dtsi: Add PM domain support Simon Horman
2015-03-05 1:58 ` [PATCH 11/11] ARM: shmobile: sh73a0: Remove restart callback Simon Horman
2015-04-01 23:38 ` Olof Johansson [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=20150401233859.GC8137@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).