$ 0 0 Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: drivers/pinctrl/sunxi/pinctrl-sunxi.c between commit: be2d107f4433 ("pi