On Tue, Feb 16, 2016 at 5:06 PM, Ralf Baechle <ralf@xxxxxxxxxxxxxx> wrote: >> -#define IRQ_TO_BIT(irq) BIT(irq_to_gpio(irq) & 0x1f) >> +#define IRQ_TO_BIT(irq) BIT((irq - JZ4740_IRQ_GPIO(0)) & 0x1f) >> >> static void jz_gpio_check_trigger_both(struct jz_gpio_chip *chip, unsigned int irq) >> { > > I've already committed an identical fix locally. > > Ralf I took that fix out of linux-next and applied to the GPIO tree so I can apply the rest of the patches without build problems. If you keep it around without changing it, git should cope I guess. Yours, Linus Walleij