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

On Mon, Aug 26, 2019 at 1:03 PM Stephen Rothwell wrote: > Today's linux-next merge of the pinctrl tree got a conflict in: > > drivers/pinctrl/bcm/pinctrl-bcm2835.c > > between commit: > > 82357f82ec69 ("pinctrl: bcm2835: Pass irqchip when adding gpiochip") > > from the gpio tree and commit:

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

Hi all, Today's linux-next merge of the pinctrl tree got a conflict in: drivers/pinctrl/bcm/pinctrl-bcm2835.c between commit: 82357f82ec69 ("pinctrl: bcm2835: Pass irqchip when adding gpiochip") from the gpio tree and commit: e38a9a437fb9 ("pinctrl: bcm2835: Add support for BCM2711