drop queue-5.4/driver-core-set-deferred_probe_timeout-to-a-longer-d.patch

diff --git a/queue-5.4/driver-core-set-deferred_probe_timeout-to-a-longer-d.patch b/queue-5.4/driver-core-set-deferred_probe_timeout-to-a-longer-d.patch
deleted file mode 100644 (file)
index 8c34587..0000000
--- a/queue-5.4/driver-core-set-deferred_probe_timeout-to-a-longer-d.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 1e05ef4f11c455ba5f4a8e886a33d329861d77f3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Feb 2020 05:08:24 +0000
-Subject: driver core: Set deferred_probe_timeout to a longer default if
- CONFIG_MODULES is set
-
-From: John Stultz <john.stultz@linaro.org>
-
-[ Upstream commit e2cec7d6853712295cef5377762165a489b2957f ]
-
-When using modules, its common for the modules not to be loaded
-until quite late by userland. With the current code,
-driver_deferred_probe_check_state() will stop returning
-EPROBE_DEFER after late_initcall, which can cause module
-dependency resolution to fail after that.
-
-So allow a longer window of 30 seconds (picked somewhat
-arbitrarily, but influenced by the similar regulator core
-timeout value) in the case where modules are enabled.
-
-Cc: linux-pm@vger.kernel.org
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Linus Walleij <linus.walleij@linaro.org>
-Cc: Thierry Reding <treding@nvidia.com>
-Cc: Mark Brown <broonie@kernel.org>
-Cc: Liam Girdwood <lgirdwood@gmail.com>
-Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
-Cc: Saravana Kannan <saravanak@google.com>
-Cc: Todd Kjos <tkjos@google.com>
-Cc: Len Brown <len.brown@intel.com>
-Cc: Pavel Machek <pavel@ucw.cz>
-Cc: Ulf Hansson <ulf.hansson@linaro.org>
-Cc: Kevin Hilman <khilman@kernel.org>
-Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
-Cc: Rob Herring <robh@kernel.org>
-Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Signed-off-by: John Stultz <john.stultz@linaro.org>
-Link: https://lore.kernel.org/r/20200225050828.56458-3-john.stultz@linaro.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/base/dd.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/drivers/base/dd.c b/drivers/base/dd.c
-index 7941a8fd22841..0b97a0c96baa3 100644
---- a/drivers/base/dd.c
-+++ b/drivers/base/dd.c
-@@ -224,7 +224,16 @@ static int deferred_devs_show(struct seq_file *s, void *data)
- }
- DEFINE_SHOW_ATTRIBUTE(deferred_devs);
- 
-+#ifdef CONFIG_MODULES
-+/*
-+ * In the case of modules, set the default probe timeout to
-+ * 30 seconds to give userland some time to load needed modules
-+ */
-+static int deferred_probe_timeout = 30;
-+#else
-+/* In the case of !modules, no probe timeout needed */
- static int deferred_probe_timeout = -1;
-+#endif
- static int __init deferred_probe_timeout_setup(char *str)
- {
-       int timeout;
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 90b383f2caeaceffd78d1ccc0981226f935f9b6e..e253a0e7f7dc660895c5d09fcd97ed0e73ae56b1 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -36,7 +36,6 @@ tcp-return-epollout-from-tcp_poll-only-when-notsent_.patch
 tcp-add-annotations-around-sk-sk_shutdown-accesses.patch
 pinctrl-pinctrl-rockchip-fix-a-bunch-of-kerneldoc-mi.patch
 pinctrl-rockchip-fix-refcount-leak-in-rockchip_pinct.patch
-driver-core-set-deferred_probe_timeout-to-a-longer-d.patch
 spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch
 net-bridge-clear-bridge-s-private-skb-space-on-xmit.patch
 selftests-bpf-avoid-running-unprivileged-tests-with-.patch