Messages in this thread | | | From | Linus Walleij <> | Date | Mon, 26 Aug 2019 13:16:42 +0200 | Subject | Re: linux-next: manual merge of the pinctrl tree with the gpio tree |
| |
On Mon, Aug 26, 2019 at 1:03 PM Stephen Rothwell <sfr@canb.auug.org.au> 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: > > e38a9a437fb9 ("pinctrl: bcm2835: Add support for BCM2711 pull-up functionality") > > from the pinctrl tree.
Ah that's so unnecessary. I will take the patch out of the GPIO tree and put it into the pinctrl tree instead, thanks for noticing!
Yours, Linus Walleij
| |