From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: Conflict between Versatile Express DT conversion and local timer updates
Date: Tue, 13 Mar 2012 14:33:07 +0000 [thread overview]
Message-ID: <201203131433.07214.arnd@arndb.de> (raw)
In-Reply-To: <4F5F52A2.3050005@arm.com>
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.
Arnd
next prev parent reply other threads:[~2012-03-13 14:33 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 [this message]
2012-03-13 15:00 ` Marc Zyngier
2012-03-14 0:52 ` Olof Johansson
2012-03-14 8:43 ` Marc Zyngier
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=201203131433.07214.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--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