Messages in this thread | | | Date | Fri, 8 Feb 2013 12:36:26 +0100 | From | Wim Van Sebroeck <> | Subject | Re: linux-next: manual merge of the watchdog tree with the mfd tree |
| |
Hi Stephen,
> Today's linux-next merge of the watchdog tree got conflicts in > drivers/watchdog/Kconfig and drivers/watchdog/Makefile between commit > 699ff59052e7 ("watchdog: Add support for ux500_wdt watchdog") from the > mfd tree and commit 77b709cb6c9d ("watchdog: introduce retu_wdt driver") > from the watchdog tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks!
Kind regards, Wim.
| |