Re: linux-next: manual merge of the gpio-brgl tree with the gpio tree

From: Linus Walleij
Date: Fri Aug 16 2019 - 18:31:06 EST

On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Today's linux-next merge of the gpio-brgl tree got a conflict in:
> include/linux/gpio/driver.h
> between commit:
> fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")
> from the gpio tree and commit:
> 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
> from the gpio-brgl tree.

OK Bartosz can you send me a pull request for your tree so we can
sync them up?

Linus Walleij