$ 0 0 Hi Greg, Today's linux-next merge of the staging tree got conflicts in: drivers/watchdog/Kconfig drivers/watchdog/Makefile between commit: 7