From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init()
Date: Tue, 22 Jan 2013 17:07:17 +0900 [thread overview]
Message-ID: <20130122080713.GA5569@verge.net.au> (raw)
In-Reply-To: <20130122072912.GD25783@quad.lixom.net>
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.
prev parent reply other threads:[~2013-01-22 8:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 7:16 [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init() Thierry Reding
2013-01-18 7:16 ` [PATCH v2 2/2] ARM: shmobile: kzm9g: Don't use gic_handle_irq() Thierry Reding
2013-01-21 0:54 ` [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init() Simon Horman
2013-01-21 7:03 ` Thierry Reding
2013-01-22 0:18 ` Simon Horman
2013-01-22 7:29 ` Olof Johansson
2013-01-22 8:07 ` Simon Horman [this message]
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=20130122080713.GA5569@verge.net.au \
--to=horms@verge.net.au \
--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).