Instead of integrating the iAMT watchdog within the mei core driver we will create a watchdog device on the mei client bus and create a proper watchdog driver for it. The patches should apply and compile on both watchdog-next and char-misc-next trees/branches. I would prefer this will go via char-misc-next as this is the tree we work against and conflicts should be trivial if at any. Alexander Usyskin (4): mei: wd: drop the watchdog code from the core mei driver mei: wd: implement MEI iAMT watchdog driver mei: wd: register wd device only if required mei: wd: re-register device on event Tomas Winkler (2): mei: drop nfc leftovers from the mei driver mei: bus: whitelist the watchdog client Documentation/misc-devices/mei/mei.txt | 12 +- MAINTAINERS | 1 + drivers/misc/mei/Kconfig | 6 +- drivers/misc/mei/Makefile | 1 - drivers/misc/mei/bus-fixup.c | 29 ++ drivers/misc/mei/client.c | 12 +- drivers/misc/mei/client.h | 4 - drivers/misc/mei/init.c | 10 +- drivers/misc/mei/interrupt.c | 15 - drivers/misc/mei/mei_dev.h | 72 +---- drivers/misc/mei/wd.c | 391 ---------------------- drivers/watchdog/Kconfig | 15 + drivers/watchdog/Makefile | 1 + drivers/watchdog/mei_wdt.c | 571 +++++++++++++++++++++++++++++++++ 14 files changed, 632 insertions(+), 508 deletions(-) delete mode 100644 drivers/misc/mei/wd.c create mode 100644 drivers/watchdog/mei_wdt.c -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
