linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] GIC DT binding support
Date: Sun, 30 Oct 2011 20:45:14 -0500	[thread overview]
Message-ID: <4EADFDAA.4000808@gmail.com> (raw)
In-Reply-To: <201110310131.53251.arnd@arndb.de>

Arnd,

On 10/30/2011 07:31 PM, Arnd Bergmann wrote:
> On Friday 28 October 2011, Rob Herring wrote:
>>   Merge branch 'for-sfr' of
>> git://openlinux.windriver.com/people/paulg/linux-next into HEAD
>> (2011-10-28 15:51:07 -0500)
>>
> 
> Rob, I think there is no chance that this is working out.
> 
> I've just spent a few hours trying to resolve all the dependencies from this,
> but I don't think it will work out, unless Linus pulls that tree very soon,
> which I think is very unlikely.
> 
> Have you made sure that Paul even considers this branch stable?

No.

> Normally this kind of change gets pushed *last* in the merge window, to make
> it possible to fix up all the stuff that breaks. This means I cannot
> wait for the branch to get merged upstream before send a pull request for
> my next/dt and next/soc branches.
> 
> Do you even depend on that branch? It seems to me that you merely have a
> conflict, not a dependency, so why do you even try fixing it up?

Sorry about this. I thought I needed to fix the linux-next build
breakage. I only depend on it when export.h gets introduced, so I can
drop that out. All the other dependencies are in Linus' master now. I
pushed out a branch without Paul's branch:

I get to Connect around 2PM tomorrow, we can discuss further then if
necessary.

The following changes since commit ce949717b559709423c1ef716a9db16d1dcadaed:

  Merge git://github.com/rustyrussell/linux (2011-10-29 07:52:16 -0700)

are available in the git repository at:

  git://sources.calxeda.com/kernel/linux.git gic-dt-v2

Rob Herring (5):
      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
      ARM: gic: fix irq_alloc_descs handling for sparse irq

 Documentation/devicetree/bindings/arm/gic.txt |   55 +++++++
 arch/arm/common/Kconfig                       |    1 +
 arch/arm/common/gic.c                         |  187
++++++++++++++++---------
 arch/arm/include/asm/hardware/gic.h           |   10 +-
 drivers/of/irq.c                              |  107 ++++++++++++++
 include/linux/irqdomain.h                     |   16 ++-
 include/linux/of_irq.h                        |    3 +
 kernel/irq/irqdomain.c                        |   12 +-
 8 files changed, 319 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/gic.txt

Rob

  reply	other threads:[~2011-10-31  1:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-24 21:38 [GIT PULL] GIC DT binding support 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 [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-14  3:01 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
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

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=4EADFDAA.4000808@gmail.com \
    --to=robherring2@gmail.com \
    --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).