[folded-merged] watchdog-core-make-use-of-devm_register_reboot_notifier-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: watchdog-core-make-use-of-devm_register_reboot_notifier-fix
has been removed from the -mm tree.  Its filename was
     watchdog-core-make-use-of-devm_register_reboot_notifier-fix.patch

This patch was dropped because it was folded into watchdog-core-make-use-of-devm_register_reboot_notifier.patch

------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: watchdog-core-make-use-of-devm_register_reboot_notifier-fix

small cleanup: avoid 80-col tricks

Cc: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/watchdog/watchdog_dev.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/watchdog/watchdog_dev.c~watchdog-core-make-use-of-devm_register_reboot_notifier-fix drivers/watchdog/watchdog_dev.c
--- a/drivers/watchdog/watchdog_dev.c~watchdog-core-make-use-of-devm_register_reboot_notifier-fix
+++ a/drivers/watchdog/watchdog_dev.c
@@ -1020,9 +1020,9 @@ static struct class watchdog_class = {
 static int watchdog_reboot_notifier(struct notifier_block *nb,
 				    unsigned long code, void *data)
 {
-	struct watchdog_device *wdd = container_of(nb, struct watchdog_device,
-						   reboot_nb);
+	struct watchdog_device *wdd;
 
+	wdd = container_of(nb, struct watchdog_device, reboot_nb);
 	if (code == SYS_DOWN || code == SYS_HALT) {
 		if (watchdog_active(wdd)) {
 			int ret;
_

Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are

watchdog-core-make-use-of-devm_register_reboot_notifier.patch
sysvipc-unteach-ids-next_id-for-checkpoint_restore-checkpatch-fixes.patch
sysvipc-make-get_maxid-o1-again-checkpatch-fixes.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux