From: khilman@linaro•org (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13
Date: Thu, 10 Oct 2013 15:02:14 -0700 [thread overview]
Message-ID: <87k3hkokd5.fsf@linaro.org> (raw)
In-Reply-To: <20131009045354.GA8369@verge.net.au> (Simon Horman's message of "Wed, 9 Oct 2013 13:53:54 +0900")
Simon Horman <horms@verge•net.au> writes:
> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote:
>> Hi Kevin, Olof and Arnd,
>>
>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13.
>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled.
>
> This pull-request causes some conflicts in
> arch/arm/mach-shmobile/board-bockw.c. In general the resolution
> strategy should be to take everything.
Thanks for the heads up. I assume you meant board-lager.c though,
right? That's where I saw the conflict.
Kevin
next prev parent reply other threads:[~2013-10-10 22:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-08 9:05 [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
2013-10-08 9:05 ` [PATCH 1/4] ARM: shmobile: r8a7778: cleanup registration of vin Simon Horman
2013-10-08 9:05 ` [PATCH 2/4] ARM: shmobile: r8a7778: cleanup registration of sh_eth Simon Horman
2013-10-08 9:05 ` [PATCH 3/4] ARM: shmobile: r8a7778: r8a7778_register_hspi() become static Simon Horman
2013-10-08 9:05 ` [PATCH 4/4] ARM: shmobile: lager: Constify platform data and resources Simon Horman
2013-10-09 4:53 ` [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Simon Horman
2013-10-10 22:02 ` Kevin Hilman [this message]
2013-10-10 22:14 ` Kevin Hilman
2013-10-10 22:19 ` Kevin Hilman
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=87k3hkokd5.fsf@linaro.org \
--to=khilman@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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