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

Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/gpio/gpio-mxc.c between commit: e188cbf7564f ("gpio: mxc: shift gpio_mxc_init() to subsys_initcall level") from the pinctrl tree and commit: 2c8d6c869feb ("gpio: mxc: drop unused MODULE_ tags from non-modular

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

Hi Geert, On Tue, 16 Feb 2016 09:23:48 +0100 Geert Uytterhoeven wrote: > > That resolution looks correct to me, but doesn't match your end result > in next-20160216: > > u32 set_mux = pctl->desc->irq_read_needs_mux && > test_bit(FLAG_USED_AS_IRQ, &chip->desc[offs

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

Hi Stephen, On Tue, Feb 16, 2016 at 4:37 AM, Stephen Rothwell wrote: > Today's linux-next merge of the gpio tree got a conflict in: > > drivers/pinctrl/sunxi/pinctrl-sunxi.c > > between commit: > > be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set") > > from the pinctrl

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

Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/pinctrl/sunxi/pinctrl-sunxi.c between commit: be2d107f4433 ("pinctrl: sunxi: Use pin number when calling sunxi_pmx_set") from the pinctrl tree and commit: 6cee3821e4e4 ("gpio/pinctrl: sunxi: stop poking aroun

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

Hi Linus, Today's linux-next merge of the gpio tree got a conflict in drivers/pinctrl/qcom/pinctrl-msm.c between commit cf1fc1876289 ("pinctrl: qcom: use restart_notifier mechanism for ps_hold") from the pinctrl tree and commit 2fcea6cecbc9 ("pinctrl: remove remaining users of gpiochip_remove() re