This is a note to let you know that I've just added the patch titled watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: watchdog-f71808e_wdt-indicate-wdiof_cardreset-support-in-watchdog_info.options.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From e871e93fb08a619dfc015974a05768ed6880fd82 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> Date: Thu, 11 Jun 2020 21:17:43 +0200 Subject: watchdog: f71808e_wdt: indicate WDIOF_CARDRESET support in watchdog_info.options From: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> commit e871e93fb08a619dfc015974a05768ed6880fd82 upstream. The driver supports populating bootstatus with WDIOF_CARDRESET, but so far userspace couldn't portably determine whether absence of this flag meant no watchdog reset or no driver support. Or-in the bit to fix this. Fixes: b97cb21a4634 ("watchdog: f71808e_wdt: Fix WDTMOUT_STS register read") Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20200611191750.28096-3-a.fatoum@xxxxxxxxxxxxxx Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/f71808e_wdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -691,7 +691,8 @@ static int __init watchdog_init(int sioa watchdog.sioaddr = sioaddr; watchdog.ident.options = WDIOC_SETTIMEOUT | WDIOF_MAGICCLOSE - | WDIOF_KEEPALIVEPING; + | WDIOF_KEEPALIVEPING + | WDIOF_CARDRESET; snprintf(watchdog.ident.identity, sizeof(watchdog.ident.identity), "%s watchdog", Patches currently in stable-queue which might be from a.fatoum@xxxxxxxxxxxxxx are queue-5.4/watchdog-f71808e_wdt-remove-use-of-wrong-watchdog_info-option.patch queue-5.4/watchdog-f71808e_wdt-clear-watchdog-timeout-occurred-flag.patch queue-5.4/watchdog-f71808e_wdt-indicate-wdiof_cardreset-support-in-watchdog_info.options.patch