Hi Stephen,
> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/Makefile between commit
> 3b937a7dbddbedd9457b33fcc8fa369c0c229c6e ("[ARM] Orion/Kirkwood: rename
> orion5x_wdt to orion_wdt") from the arm tree and commit
> e35f878d8313518a20d3c53393d14761dca74624 ("[WATCHDOG] U300 COH 901 327
> watchdog driver") from the watchdog tree.
It would have been nice if the orion watchdog rename patch would have been
sent to the watchdog maintainer also...
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
I'll have a look at the commit and might pull it into the watchdog tree also.
That way you shouldn't have any problem with it.
Kind regards,
Wim.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
