From: Sasha Levin Date: Tue, 11 Jun 2019 19:29:00 +0000 (-0400) Subject: Drop watchdog patch X-Git-Tag: v5.1.10~16^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6453637588c41c5dbaf4395c6a5156e0914ffc55;p=thirdparty%2Fkernel%2Fstable-queue.git Drop watchdog patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/series b/queue-4.14/series index ec26a3c9d5d..2bf1b36b305 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -32,7 +32,6 @@ configfs-fix-possible-use-after-free-in-configfs_reg.patch uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch mmc-mmci-prevent-polling-for-busy-detection-in-irq-c.patch mips-make-sure-dt-memory-regions-are-valid.patch -watchdog-use-depends-instead-of-select-for-pretimeou.patch watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch watchdog-fix-compile-time-error-of-pretimeout-govern.patch blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch diff --git a/queue-4.14/watchdog-use-depends-instead-of-select-for-pretimeou.patch b/queue-4.14/watchdog-use-depends-instead-of-select-for-pretimeou.patch deleted file mode 100644 index 82bb15910e8..00000000000 --- a/queue-4.14/watchdog-use-depends-instead-of-select-for-pretimeou.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 0c7da98aea784206c87e1e2fd07e3e0994f7679d Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 29 Apr 2019 12:28:27 -0700 -Subject: watchdog: Use depends instead of select for pretimeout governors - -[ Upstream commit f627ac0e12cd2736e60b9f5782ecec1d97251f77 ] - -Watchdog pretimeout governors were enabled from the default governor -selection using "select". As a result, the default governor was always -built into the kernel, even if no watchdog driver was loaded. By using -"depends on" instead of "select", we are in better control, and the -governors can all be built as modules. At the same time, set the default -configuration option for pretimeout governors to match WATCHDOG_CORE -(meaning all pretimeout governors are by default enabled if pretimeout -support is enabled). - -The practical impact of this change is minimal. Previously, selecting -a default governor automatically enabled that governor. Now, a default -governor can only be selected if that governor has been enabled. -Consequently, the order of governor selection is now reversed: The -governor selection is now first, followed by default governor selection. - -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 3ece1335ba84..ddd4a06b2ab8 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -1946,6 +1946,20 @@ config WATCHDOG_PRETIMEOUT_GOV - - if WATCHDOG_PRETIMEOUT_GOV - -+config WATCHDOG_PRETIMEOUT_GOV_NOOP -+ tristate "Noop watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Noop watchdog pretimeout governor, only an informational -+ message is added to kernel log buffer. -+ -+config WATCHDOG_PRETIMEOUT_GOV_PANIC -+ tristate "Panic watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Panic watchdog pretimeout governor, on watchdog pretimeout -+ event put the kernel into panic. -+ - choice - prompt "Default Watchdog Pretimeout Governor" - default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC -@@ -1956,7 +1970,7 @@ choice - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - bool "noop" -- select WATCHDOG_PRETIMEOUT_GOV_NOOP -+ depends on WATCHDOG_PRETIMEOUT_GOV_NOOP - help - Use noop watchdog pretimeout governor by default. If noop - governor is selected by a user, write a short message to -@@ -1964,7 +1978,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - bool "panic" -- select WATCHDOG_PRETIMEOUT_GOV_PANIC -+ depends on WATCHDOG_PRETIMEOUT_GOV_PANIC - help - Use panic watchdog pretimeout governor by default, if - a watchdog pretimeout event happens, consider that -@@ -1972,18 +1986,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - - endchoice - --config WATCHDOG_PRETIMEOUT_GOV_NOOP -- tristate "Noop watchdog pretimeout governor" -- help -- Noop watchdog pretimeout governor, only an informational -- message is added to kernel log buffer. -- --config WATCHDOG_PRETIMEOUT_GOV_PANIC -- tristate "Panic watchdog pretimeout governor" -- help -- Panic watchdog pretimeout governor, on watchdog pretimeout -- event put the kernel into panic. -- - endif # WATCHDOG_PRETIMEOUT_GOV - - endif # WATCHDOG --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 561fae2f409..e66b824e02f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -50,7 +50,6 @@ netfilter-nf_flow_table-fix-missing-error-check-for-.patch netfilter-nf_conntrack_h323-restore-boundary-check-c.patch mips-make-sure-dt-memory-regions-are-valid.patch netfilter-nf_tables-fix-base-chain-stat-rcu_derefere.patch -watchdog-use-depends-instead-of-select-for-pretimeou.patch watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch watchdog-fix-compile-time-error-of-pretimeout-govern.patch blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch diff --git a/queue-4.19/watchdog-use-depends-instead-of-select-for-pretimeou.patch b/queue-4.19/watchdog-use-depends-instead-of-select-for-pretimeou.patch deleted file mode 100644 index 1806cf1f8aa..00000000000 --- a/queue-4.19/watchdog-use-depends-instead-of-select-for-pretimeou.patch +++ /dev/null @@ -1,94 +0,0 @@ -From b65bd147a623ca816cda72630e049f95b03d233b Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 29 Apr 2019 12:28:27 -0700 -Subject: watchdog: Use depends instead of select for pretimeout governors - -[ Upstream commit f627ac0e12cd2736e60b9f5782ecec1d97251f77 ] - -Watchdog pretimeout governors were enabled from the default governor -selection using "select". As a result, the default governor was always -built into the kernel, even if no watchdog driver was loaded. By using -"depends on" instead of "select", we are in better control, and the -governors can all be built as modules. At the same time, set the default -configuration option for pretimeout governors to match WATCHDOG_CORE -(meaning all pretimeout governors are by default enabled if pretimeout -support is enabled). - -The practical impact of this change is minimal. Previously, selecting -a default governor automatically enabled that governor. Now, a default -governor can only be selected if that governor has been enabled. -Consequently, the order of governor selection is now reversed: The -governor selection is now first, followed by default governor selection. - -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 5ea8909a41f9..8c9ea3cd9c60 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -1972,6 +1972,20 @@ config WATCHDOG_PRETIMEOUT_GOV - - if WATCHDOG_PRETIMEOUT_GOV - -+config WATCHDOG_PRETIMEOUT_GOV_NOOP -+ tristate "Noop watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Noop watchdog pretimeout governor, only an informational -+ message is added to kernel log buffer. -+ -+config WATCHDOG_PRETIMEOUT_GOV_PANIC -+ tristate "Panic watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Panic watchdog pretimeout governor, on watchdog pretimeout -+ event put the kernel into panic. -+ - choice - prompt "Default Watchdog Pretimeout Governor" - default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC -@@ -1982,7 +1996,7 @@ choice - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - bool "noop" -- select WATCHDOG_PRETIMEOUT_GOV_NOOP -+ depends on WATCHDOG_PRETIMEOUT_GOV_NOOP - help - Use noop watchdog pretimeout governor by default. If noop - governor is selected by a user, write a short message to -@@ -1990,7 +2004,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - bool "panic" -- select WATCHDOG_PRETIMEOUT_GOV_PANIC -+ depends on WATCHDOG_PRETIMEOUT_GOV_PANIC - help - Use panic watchdog pretimeout governor by default, if - a watchdog pretimeout event happens, consider that -@@ -1998,18 +2012,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - - endchoice - --config WATCHDOG_PRETIMEOUT_GOV_NOOP -- tristate "Noop watchdog pretimeout governor" -- help -- Noop watchdog pretimeout governor, only an informational -- message is added to kernel log buffer. -- --config WATCHDOG_PRETIMEOUT_GOV_PANIC -- tristate "Panic watchdog pretimeout governor" -- help -- Panic watchdog pretimeout governor, on watchdog pretimeout -- event put the kernel into panic. -- - endif # WATCHDOG_PRETIMEOUT_GOV - - endif # WATCHDOG --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 7c86dd362ea..181f1a8d2c3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -24,7 +24,6 @@ f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch configfs-fix-possible-use-after-free-in-configfs_reg.patch uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch mips-make-sure-dt-memory-regions-are-valid.patch -watchdog-use-depends-instead-of-select-for-pretimeou.patch watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch watchdog-fix-compile-time-error-of-pretimeout-govern.patch iommu-vt-d-set-intel_iommu_gfx_mapped-correctly.patch diff --git a/queue-4.9/watchdog-use-depends-instead-of-select-for-pretimeou.patch b/queue-4.9/watchdog-use-depends-instead-of-select-for-pretimeou.patch deleted file mode 100644 index 7c2b6a3f392..00000000000 --- a/queue-4.9/watchdog-use-depends-instead-of-select-for-pretimeou.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 3f0b7169d2ea3509b479c35e5d7f48d0af04c4d3 Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 29 Apr 2019 12:28:27 -0700 -Subject: watchdog: Use depends instead of select for pretimeout governors - -[ Upstream commit f627ac0e12cd2736e60b9f5782ecec1d97251f77 ] - -Watchdog pretimeout governors were enabled from the default governor -selection using "select". As a result, the default governor was always -built into the kernel, even if no watchdog driver was loaded. By using -"depends on" instead of "select", we are in better control, and the -governors can all be built as modules. At the same time, set the default -configuration option for pretimeout governors to match WATCHDOG_CORE -(meaning all pretimeout governors are by default enabled if pretimeout -support is enabled). - -The practical impact of this change is minimal. Previously, selecting -a default governor automatically enabled that governor. Now, a default -governor can only be selected if that governor has been enabled. -Consequently, the order of governor selection is now reversed: The -governor selection is now first, followed by default governor selection. - -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 8f8909a668d7..15c01830799a 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -1855,6 +1855,20 @@ config WATCHDOG_PRETIMEOUT_GOV - - if WATCHDOG_PRETIMEOUT_GOV - -+config WATCHDOG_PRETIMEOUT_GOV_NOOP -+ tristate "Noop watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Noop watchdog pretimeout governor, only an informational -+ message is added to kernel log buffer. -+ -+config WATCHDOG_PRETIMEOUT_GOV_PANIC -+ tristate "Panic watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Panic watchdog pretimeout governor, on watchdog pretimeout -+ event put the kernel into panic. -+ - choice - prompt "Default Watchdog Pretimeout Governor" - default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC -@@ -1865,7 +1879,7 @@ choice - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - bool "noop" -- select WATCHDOG_PRETIMEOUT_GOV_NOOP -+ depends on WATCHDOG_PRETIMEOUT_GOV_NOOP - help - Use noop watchdog pretimeout governor by default. If noop - governor is selected by a user, write a short message to -@@ -1873,7 +1887,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - bool "panic" -- select WATCHDOG_PRETIMEOUT_GOV_PANIC -+ depends on WATCHDOG_PRETIMEOUT_GOV_PANIC - help - Use panic watchdog pretimeout governor by default, if - a watchdog pretimeout event happens, consider that -@@ -1881,18 +1895,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - - endchoice - --config WATCHDOG_PRETIMEOUT_GOV_NOOP -- tristate "Noop watchdog pretimeout governor" -- help -- Noop watchdog pretimeout governor, only an informational -- message is added to kernel log buffer. -- --config WATCHDOG_PRETIMEOUT_GOV_PANIC -- tristate "Panic watchdog pretimeout governor" -- help -- Panic watchdog pretimeout governor, on watchdog pretimeout -- event put the kernel into panic. -- - endif # WATCHDOG_PRETIMEOUT_GOV - - endif # WATCHDOG --- -2.20.1 - diff --git a/queue-5.1/series b/queue-5.1/series index ffba0ed60d3..afc129a4102 100644 --- a/queue-5.1/series +++ b/queue-5.1/series @@ -65,7 +65,6 @@ netfilter-nf_flow_table-fix-missing-error-check-for-.patch netfilter-nf_conntrack_h323-restore-boundary-check-c.patch mips-make-sure-dt-memory-regions-are-valid.patch netfilter-nf_tables-fix-base-chain-stat-rcu_derefere.patch -watchdog-use-depends-instead-of-select-for-pretimeou.patch watchdog-imx2_wdt-fix-set_timeout-for-big-timeout-va.patch watchdog-fix-compile-time-error-of-pretimeout-govern.patch blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch diff --git a/queue-5.1/watchdog-use-depends-instead-of-select-for-pretimeou.patch b/queue-5.1/watchdog-use-depends-instead-of-select-for-pretimeou.patch deleted file mode 100644 index 09f14209591..00000000000 --- a/queue-5.1/watchdog-use-depends-instead-of-select-for-pretimeou.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 494a7e68e63df441a9925e94dc801cafbbfc687d Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 29 Apr 2019 12:28:27 -0700 -Subject: watchdog: Use depends instead of select for pretimeout governors - -[ Upstream commit f627ac0e12cd2736e60b9f5782ecec1d97251f77 ] - -Watchdog pretimeout governors were enabled from the default governor -selection using "select". As a result, the default governor was always -built into the kernel, even if no watchdog driver was loaded. By using -"depends on" instead of "select", we are in better control, and the -governors can all be built as modules. At the same time, set the default -configuration option for pretimeout governors to match WATCHDOG_CORE -(meaning all pretimeout governors are by default enabled if pretimeout -support is enabled). - -The practical impact of this change is minimal. Previously, selecting -a default governor automatically enabled that governor. Now, a default -governor can only be selected if that governor has been enabled. -Consequently, the order of governor selection is now reversed: The -governor selection is now first, followed by default governor selection. - -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 242eea859637..1d3b4bfbbc4d 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -2033,6 +2033,20 @@ config WATCHDOG_PRETIMEOUT_GOV - - if WATCHDOG_PRETIMEOUT_GOV - -+config WATCHDOG_PRETIMEOUT_GOV_NOOP -+ tristate "Noop watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Noop watchdog pretimeout governor, only an informational -+ message is added to kernel log buffer. -+ -+config WATCHDOG_PRETIMEOUT_GOV_PANIC -+ tristate "Panic watchdog pretimeout governor" -+ default WATCHDOG_CORE -+ help -+ Panic watchdog pretimeout governor, on watchdog pretimeout -+ event put the kernel into panic. -+ - choice - prompt "Default Watchdog Pretimeout Governor" - default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC -@@ -2043,7 +2057,7 @@ choice - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - bool "noop" -- select WATCHDOG_PRETIMEOUT_GOV_NOOP -+ depends on WATCHDOG_PRETIMEOUT_GOV_NOOP - help - Use noop watchdog pretimeout governor by default. If noop - governor is selected by a user, write a short message to -@@ -2051,7 +2065,7 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP - - config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - bool "panic" -- select WATCHDOG_PRETIMEOUT_GOV_PANIC -+ depends on WATCHDOG_PRETIMEOUT_GOV_PANIC - help - Use panic watchdog pretimeout governor by default, if - a watchdog pretimeout event happens, consider that -@@ -2059,18 +2073,6 @@ config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC - - endchoice - --config WATCHDOG_PRETIMEOUT_GOV_NOOP -- tristate "Noop watchdog pretimeout governor" -- help -- Noop watchdog pretimeout governor, only an informational -- message is added to kernel log buffer. -- --config WATCHDOG_PRETIMEOUT_GOV_PANIC -- tristate "Panic watchdog pretimeout governor" -- help -- Panic watchdog pretimeout governor, on watchdog pretimeout -- event put the kernel into panic. -- - endif # WATCHDOG_PRETIMEOUT_GOV - - endif # WATCHDOG --- -2.20.1 -