drop 4.17 patch

diff --git a/queue-4.17/lib-test_printf.c-call-wait_for_random_bytes-before-plain-p-tests.patch b/queue-4.17/lib-test_printf.c-call-wait_for_random_bytes-before-plain-p-tests.patch
deleted file mode 100644 (file)
index a072b77..0000000
--- a/queue-4.17/lib-test_printf.c-call-wait_for_random_bytes-before-plain-p-tests.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From foo@baz Sat Jul 28 10:14:30 CEST 2018
-From: Thierry Escande <thierry.escande@linaro.org>
-Date: Thu, 14 Jun 2018 15:28:15 -0700
-Subject: lib/test_printf.c: call wait_for_random_bytes() before plain %p tests
-
-From: Thierry Escande <thierry.escande@linaro.org>
-
-[ Upstream commit ee410f15b1418f2f4428e79980674c979081bcb7 ]
-
-If the test_printf module is loaded before the crng is initialized, the
-plain 'p' tests will fail because the printed address will not be hashed
-and the buffer will contain '(ptrval)' instead.
-
-This patch adds a call to wait_for_random_bytes() before plain 'p' tests
-to make sure the crng is initialized.
-
-Link: http://lkml.kernel.org/r/20180604113708.11554-1-thierry.escande@linaro.org
-Signed-off-by: Thierry Escande <thierry.escande@linaro.org>
-Acked-by: Tobin C. Harding <me@tobin.cc>
-Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
-Cc: David Miller <davem@davemloft.net>
-Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- lib/test_printf.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/lib/test_printf.c
-+++ b/lib/test_printf.c
-@@ -260,6 +260,13 @@ plain(void)
- {
-       int err;
- 
-+      /*
-+       * Make sure crng is ready. Otherwise we get "(ptrval)" instead
-+       * of a hashed address when printing '%p' in plain_hash() and
-+       * plain_format().
-+       */
-+      wait_for_random_bytes();
-+
-       err = plain_hash();
-       if (err) {
-               pr_warn("plain 'p' does not appear to be hashed\n");

diff --git a/queue-4.17/series b/queue-4.17/series
index 195509425151ad82cfc455a1f64776fe7f7d7e47..27e2f1b4f913c56d17ca8248c67c2ddf5498587d 100644 (file)
--- a/queue-4.17/series
+++ b/queue-4.17/series
@@ -13,7 +13,6 @@ tracing-quiet-gcc-warning-about-maybe-unused-link-variable.patch
 arm64-fix-vmemmap-build_bug_on-triggering-on-vmemmap-setups.patch
 drm-i915-glk-add-quirk-for-glk-nuc-hdmi-port-issues.patch
 mlxsw-spectrum_switchdev-fix-port_vlan-refcounting.patch
-lib-test_printf.c-call-wait_for_random_bytes-before-plain-p-tests.patch
 kcov-ensure-irq-code-sees-a-valid-area.patch
 mm-check-for-sigkill-inside-dup_mmap-loop.patch
 drm-amd-powerplay-set-higher-sclk-mclk-frequency-than-dpm7-in-od-v2.patch