[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110429174355.GA21098@ponder.secretlab.ca>
Date: Fri, 29 Apr 2011 11:43:55 -0600
From: Grant Likely <grant.likely@...retlab.ca>
To: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Cc: Michal Simek <monstr@...str.eu>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
linux-kernel@...r.kernel.org, Ralf Baechle <ralf@...ux-mips.org>,
hpa@...or.com, Dirk Brandewie <dirk.brandewie@...il.com>,
Thomas Gleixner <tglx@...utronix.de>,
devicetree-discuss@...ts.ozlabs.org, x86@...nel.org,
linuxppc-dev@...ts.ozlabs.org
Subject: Re: [PATCH 0/6] General device tree irq domain infrastructure
On Fri, Apr 29, 2011 at 06:16:33PM +0200, Sebastian Andrzej Siewior wrote:
> Grant Likely wrote:
> >I'd really like to get patches 1-4 merged into 2.6.40. Please test.
> >I'm also running through build testing here, and when it's complete
> >I'll push it out to a 'devicetree/irq-domain' branch on
> >git://git.secretlab.ca/git/linux-2.6
>
> I pulled this, built and booted my x86-dt box and nothing exploded so far.
>
> If you merge Linus' tree then you will get a conflict (sooner or later) in
> ioapic_of_irq_map() in arch/x86/kernel/devicetree.c:
>
> - return io_apic_setup_irq_pin_once(*out_hwirq, cpu_to_node(0), &attr);
> - if (io_apic_setup_irq_pin(hwirq, cpu_to_node(0), &attr))
> ++ if (io_apic_setup_irq_pin_once(hwirq, cpu_to_node(0), &attr))
>
> Sebastian
Thanks Sebastian. Unless you say otherwise, I'll take that as an Acked-by. :-)
g.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists