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

Hi Stephen, Linus On Tue, Jul 9, 2019 at 2:16 AM Stephen Rothwell wrote: > > Today's linux-next merge of the gpio tree got a conflict in: > > > > drivers/gpio/Makefile > > > > between commit: > > > > 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block") > > > > from the mfd

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

Hi all, On Fri, 28 Jun 2019 17:28:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/gpio/Makefile > > between commit: > > 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block") > > from the mfd tree and commit: > >

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

Hi all, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/Makefile between commit: 18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block") from the mfd tree and commit: db16bad6efd9 ("gpio: Sort GPIO drivers in Makefile") from the gpio tree. I fixed

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

On Wed, Mar 9, 2016 at 12:35 PM, Lee Jones wrote: >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > I sent out a pull-request for this already. > > Please pull 'ib-mfd-regulator-gpio-4.6' from my tree. I merged Lee's immutable

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

On Wed, Mar 9, 2016 at 12:35 PM, Lee Jones wrote: >> I fixed it up (see below) and can carry the fix as necessary (no action >> is required). > > I sent out a pull-request for this already. > > Please pull 'ib-mfd-regulator-gpio-4.6' from my tree. I merged Lee's immutable branch to the GPIO

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

On Wed, 09 Mar 2016, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/gpio/gpio-tps65912.c > > between commits: > > 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new > driver") > ca801a22f465 ("gpio:

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

On Wed, 09 Mar 2016, Stephen Rothwell wrote: > Hi Linus, > > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/gpio/gpio-tps65912.c > > between commits: > > 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new > driver") > ca801a22f465 ("gpio:

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

Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/gpio-tps65912.c between commits: 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver") ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC") from the mfd tree

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

Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/gpio-tps65912.c between commits: 65b6555971d0 ("mfd: tps65912: Remove old driver in preparation for new driver") ca801a22f465 ("gpio: tps65912: Add GPIO driver for the TPS65912 PMIC") from the mfd tree

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

Hi Linus, Today's linux-next merge of the gpio tree got conflicts in: drivers/gpio/Kconfig drivers/gpio/Makefile between commit: 5d8c473983fc ("gpio: tps65086: Add GPO driver for the TPS65086 PMIC") from the mfd tree and commit: b866526d0cfe ("gpio: Add driver for TI TPIC2810")

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

Hi Linus, Today's linux-next merge of the gpio tree got conflicts in: drivers/gpio/Kconfig drivers/gpio/Makefile between commit: 5d8c473983fc ("gpio: tps65086: Add GPO driver for the TPS65086 PMIC") from the mfd tree and commit: b866526d0cfe ("gpio: Add driver for TI TPIC2810")