$ 0 0 Hi Linus, Today's linux-next merge of the gpio tree got a conflict in: MAINTAINERS between commit: c36a483d8007 ("watchdog: Add watchdog timer