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

2019-08-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: include/linux/gpio/driver.h between commit: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h") from the gpio tree and commit: 9091373ab7ea ("gpio: remove less important #ifdef around declarat

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

2019-08-18 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: include/linux/gpio/driver.h between commit: 379ce1ff51aa ("gpio: stubs in headers should be inline") from the gpio tree and commit: 9091373ab7ea ("gpio: remove less important #ifdef around declarations") from the

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

2019-08-16 Thread Linus Walleij
On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell 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: > > 9091373a

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

2019-08-15 Thread Stephen Rothwell
Hi all, 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") f