$ 0 0 Hi Linus, Today's linux-next merge of the gpio tree got conflicts in: drivers/gpio/Kconfig drivers/gpio/Makefile between commit: 5d8c473983f