Messages in this thread | | | From | Linus Walleij <> | Date | Fri, 3 Nov 2017 08:50:31 +0100 | Subject | Re: linux-next: build failure after merge of the gpio tree |
| |
On Thu, Nov 2, 2017 at 6:20 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus, > > After merging the gpio tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpio/gpio-uniphier.c:324:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] > .activate = uniphier_gpio_irq_domain_activate, > ^ > > Caused by commit > > dbe776c2ca54 ("gpio: uniphier: add UniPhier GPIO controller driver") > > interacting with commit > > 72491643469a ("genirq/irqdomain: Update irq_domain_ops.activate() signature") > > from the tip tree > > I added the following merge fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Thu, 2 Nov 2017 16:10:46 +1100 > Subject: [PATCH] gpio: uniphier: merge fix for "Update > irq_domain_ops.activate() signature" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
I applied this patch to the GPIO tree, I guess it is the right thing to do at this point.
I suspect the IRQ infrastructure will be pulled to Torvald's tree first anyway.
Yours, Linus Walleij
| |