mbox

[GIT,PULL] GIC DT binding support

Message ID 4EAB1BFF.3070406@gmail.com
State New
Headers show

Pull-request

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

Message

Rob Herring Oct. 28, 2011, 9:17 p.m. UTC 
Arnd,

On 10/24/2011 04:38 PM, Rob Herring wrote:
> Arnd,
> 
> I'm not sure if you want a rebased branch to fix merge conflicts or not.
> If that's okay, please pull. I've also fixed the msm compile failure.
> 
> The dependencies are v3.1-rc9 and rmk's devel-stable.
> 

Here's an updated pull request to fix missing export.h include. Now it's
also dependent on module.h clean-up branch:

git://openlinux.windriver.com/people/paulg/linux-next for-sfr


The following changes since commit fa1d6d372245a160eecf5f57d64d2b21ea248e08:

  Merge branch 'for-sfr' of
git://openlinux.windriver.com/people/paulg/linux-next into HEAD
(2011-10-28 15:51:07 -0500)

are available in the git repository at:

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

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                         |  188
++++++++++++++++--------
 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, 320 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/gic.txt

Rob

Comments

Arnd Bergmann Oct. 30, 2011, 10:39 p.m. UTC | #1 
On Friday 28 October 2011, Rob Herring wrote:
> Here's an updated pull request to fix missing export.h include. Now it's
> also dependent on module.h clean-up branch:
> 
> git://openlinux.windriver.com/people/paulg/linux-next for-sfr
> 
> 
> The following changes since commit fa1d6d372245a160eecf5f57d64d2b21ea248e08:
> 
>   Merge branch 'for-sfr' of
> git://openlinux.windriver.com/people/paulg/linux-next into HEAD
> (2011-10-28 15:51:07 -0500)
> 
> are available in the git repository at:
> 
>   git://sources.calxeda.com/kernel/linux.git gic-dt

I've pulled it and am now trying to clean up the mess resulting from
having the previous version in a number of branches already.

Can you check that the highbank/soc branch is ok this time?

	Arnd
Arnd Bergmann Oct. 31, 2011, 12:31 a.m. UTC | #2 
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?

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?

	Arnd