Messages in this thread | | | Date | Tue, 22 Jan 2013 17:07:17 +0900 | From | Simon Horman <> | Subject | Re: [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init() |
| |
On Mon, Jan 21, 2013 at 11:29:12PM -0800, Olof Johansson wrote: > On Mon, Jan 21, 2013 at 08:03:01AM +0100, Thierry Reding wrote: > > On Mon, Jan 21, 2013 at 09:54:39AM +0900, Simon Horman wrote: > > > On Fri, Jan 18, 2013 at 08:16:12AM +0100, Thierry Reding wrote: > > > > The asm/hardware/gic.h header does no longer exist and the corresponding > > > > functionality was moved to linux/irqchip.h and linux/irqchip/arm-gic.h > > > > respectively. gic_handle_irq() and of_irq_init() are no longer available > > > > either and have been replaced by irqchip_init(). > > > > > > asm/hardware/gic.h Seems to still exist in Linus's tree. > > > Could you let me know which tree of which branch I should depend on > > > in order to apply this change? > > > > I found this when doing an automated build over all ARM defconfigs on > > linux-next. > > > > Commit 520f7bd73354f003a9a59937b28e4903d985c420 "irqchip: Move ARM gic.h > > to include/linux/irqchip/arm-gic.h" moved the file and was merged > > through Olof Johansson's next/cleanup and for-next branches. > > > > Adding Olof on Cc since I'm not quite sure myself about how this is > > handled. > > The way to handle this is to base the branch you are adding new shmobile code > in, on top of the cleanup branches that changes the underlying infrastructure. > This is why we merge it early during the release, so that new code for various > platforms can be based on it to avoid a bunch of conflicts in the end. > > In this case, you might need to base your branch onto a merge of both > the irqchip/gic-vic-move and timer/cleanup branches from arm-soc.
Thanks, I'll take a look at rebasing accordingly.
| |