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

From: Lee Jones
Date: Wed Mar 09 2016 - 00:35:54 EST

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: tps65912: Add GPIO driver for the TPS65912 PMIC")
> from the mfd tree and commit:
> 0964ac703edf ("gpio: tps65912: Use devm_gpiochip_add_data() for gpio registration")
> from the gpio tree.
> 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.

Lee Jones
Linaro STMicroelectronics Landing Team Lead â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog