From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] GIC DT binding support
Date: Thu, 20 Oct 2011 13:50:53 +0100 [thread overview]
Message-ID: <20111020125053.GB21648@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20111020124847.GG32007@S2100-06.ap.freescale.net>
On Thu, Oct 20, 2011 at 08:48:48PM +0800, Shawn Guo wrote:
> On Thu, Oct 13, 2011 at 10:01:21PM -0500, Rob Herring wrote:
> > Rob Herring (4):
> > of/irq: introduce of_irq_init
> > irq: support domains with non-zero hwirq base
> > ARM: gic: add irq_domain support
> > ARM: gic: add OF based initialization
> >
> Hi Rob,
>
> Russell is going to take Marc Zyngier's ppi series for v3.2 merge
> window. I just noticed your patch 'ARM: gic: add irq_domain support'
> gets some conflict with Marc's series on function gic_dist_init(),
> which is not so obvious to resolve. You may want to take a look.
Don't be so sure - Marc has rebased commits which exist in Thomas' tree,
so I can't pull it as-is. That needs to be resolving - but unfortunately
Thomas is not responding (I suspect he's busy elsewhere also because of
the proximity of the kernel summit.)
Given that this is my _last_ full working day before the kernel summit,
time is running very short to resolve these problems. So, I think that
all this GIC stuff may have to wait until after the KS, and maybe for
the following merge window too.
next prev parent reply other threads:[~2011-10-20 12:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-14 3:01 [GIT PULL] GIC DT binding support Rob Herring
2011-10-14 3:18 ` Shawn Guo
2011-10-18 9:53 ` Domenico Andreoli
2011-10-18 14:50 ` Rob Herring
2011-10-18 14:58 ` Domenico Andreoli
2011-10-18 15:10 ` Rob Herring
2011-10-20 12:48 ` Shawn Guo
2011-10-20 12:50 ` Russell King - ARM Linux [this message]
2011-10-20 13:07 ` Arnd Bergmann
2011-10-20 14:34 ` Rob Herring
2011-10-20 16:12 ` Arnd Bergmann
2011-10-20 17:09 ` Rob Herring
2011-10-20 18:56 ` Russell King - ARM Linux
2011-10-20 21:04 ` Arnd Bergmann
2011-10-21 18:33 ` Russell King - ARM Linux
2011-10-21 19:31 ` Arnd Bergmann
2011-10-21 22:25 ` Russell King - ARM Linux
2011-10-20 21:08 ` Rob Herring
2011-10-20 21:15 ` Russell King - ARM Linux
2011-10-20 21:17 ` Arnd Bergmann
2011-10-21 8:51 ` Arnd Bergmann
2011-10-21 20:09 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2011-10-24 21:38 Rob Herring
2011-10-28 21:17 ` Rob Herring
2011-10-30 22:39 ` Arnd Bergmann
2011-10-31 0:31 ` Arnd Bergmann
2011-10-31 1:45 ` Rob Herring
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=20111020125053.GB21648@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).