From: marc.zyngier@arm•com (Marc Zyngier)
To: linux-arm-kernel@lists•infradead.org
Subject: Conflict between Versatile Express DT conversion and local timer updates
Date: Wed, 14 Mar 2012 08:43:39 +0000 [thread overview]
Message-ID: <4F605A3B.5030800@arm.com> (raw)
In-Reply-To: <CAOesGMjo=JT3TKwne+m5XUpkBMQFKQLZrr1T60m+Wx7YgqMiOA@mail.gmail.com>
On 14/03/12 00:52, Olof Johansson wrote:
> On Tue, Mar 13, 2012 at 7:33 AM, Arnd Bergmann <arnd@arndb•de> wrote:
>> On Tuesday 13 March 2012, Marc Zyngier wrote:
>>> On 13/03/12 11:55, Arnd Bergmann wrote:
>>>> On Tuesday 13 March 2012, Marc Zyngier wrote:
>>>>> On 13/03/12 10:15, Russell King - ARM Linux wrote:
>>
>>>> d) create a new next/timer branch in arm-soc that has Pawel's
>>>> 98ed4ceb "ARM: vexpress: Get rid of MMIO_P2V" (the first patch from
>>>> vexpress/dt, your patches and the ux500/timer series. Also put
>>>> 98ed4ceb into the next/cleanup branch.
>>>>
>>>> Any of those will work for us, my preference would be on #4. I have
>>>> created the next/timer branch in the arm-soc tree, so you can use
>>>> that and either rebase your patches on top or merge your tree into
>>>> it and fix up the merge conflicts.
>>>
>>> Thanks for doing that Arnd.
>>>
>>> I've thus created a new branch:
>>> git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
>>> local_timers-for-arm-soc
>>>
>>> which contains the arm-soc next/timers branch as well as my local timers
>>> series. I'd greatly appreciate if you could pull it for 3.4.
>>>
>>
>> I've updated the next/timer branch with your changes now, but did not
>> put it into the for-next branch because Olof is currently handling that.
>>
>> Olof, can you add it to for-next please? The timer branch should have
>> no dependencies other than rmk/for-armsoc, so it can be fairly close to
>> the start.
>
>
> Thanks. I merged into for-next, but since there's already a history in
> there and I didn't rebuild it, it's on top of everything else.
>
> I got two trivial merge conflicts (and a few that git sorted out
> automatically): one with the tegra makefile, the other with shmobile's
> timer init.
>
> Marc, please take a look at the next/timers merge in the arm-soc
> for-next branch and let me know if they're OK. I'm pretty sure they
> are though.
Had a brief look, and it seems alright to me.
Thanks Olof!
M.
--
Jazz is not dead. It just smells funny...
next prev parent reply other threads:[~2012-03-14 8:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 23:10 Conflict between Versatile Express DT conversion and local timer updates Russell King - ARM Linux
2012-03-12 23:59 ` Russell King - ARM Linux
2012-03-13 1:23 ` Olof Johansson
2012-03-13 9:39 ` Marc Zyngier
2012-03-13 10:15 ` Russell King - ARM Linux
2012-03-13 10:58 ` Marc Zyngier
2012-03-13 11:55 ` Arnd Bergmann
2012-03-13 13:58 ` Marc Zyngier
2012-03-13 14:33 ` Arnd Bergmann
2012-03-13 15:00 ` Marc Zyngier
2012-03-14 0:52 ` Olof Johansson
2012-03-14 8:43 ` Marc Zyngier [this message]
2012-03-15 7:17 ` Stephen Rothwell
2012-03-15 9:21 ` Russell King - ARM Linux
2012-03-15 9:36 ` Russell King - ARM Linux
2012-03-15 9:44 ` Stephen Rothwell
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=4F605A3B.5030800@arm.com \
--to=marc.zyngier@arm$(echo .)com \
--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