From: Greg Kroah-Hartman Date: Mon, 23 Apr 2018 17:25:24 +0000 (+0200) Subject: drop 2 random patches from 4.16 for now X-Git-Tag: v3.18.106~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e104b4c8f8cff0bb9dd52e43da748f4db3941b4;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 random patches from 4.16 for now --- diff --git a/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch b/pending/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch similarity index 100% rename from queue-4.16/random-add-new-ioctl-rndreseedcrng.patch rename to pending/queue-4.16/random-add-new-ioctl-rndreseedcrng.patch diff --git a/queue-4.16/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch b/pending/queue-4.16/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch similarity index 100% rename from queue-4.16/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch rename to pending/queue-4.16/random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch diff --git a/queue-4.16/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch b/queue-4.16/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch index e76e60c046f..b3bcea9f356 100644 --- a/queue-4.16/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch +++ b/queue-4.16/random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/char/random.c +++ b/drivers/char/random.c -@@ -905,7 +905,7 @@ static void crng_reseed(struct crng_stat +@@ -879,7 +879,7 @@ static void crng_reseed(struct crng_stat _crng_backtrack_protect(&primary_crng, buf.block, CHACHA20_KEY_SIZE); } @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman for (i = 0; i < 8; i++) { unsigned long rv; if (!arch_get_random_seed_long(&rv) && -@@ -915,7 +915,7 @@ static void crng_reseed(struct crng_stat +@@ -889,7 +889,7 @@ static void crng_reseed(struct crng_stat } memzero_explicit(&buf, sizeof(buf)); crng->init_time = jiffies; @@ -37,4 +37,4 @@ Signed-off-by: Greg Kroah-Hartman + spin_unlock_irqrestore(&crng->lock, flags); if (crng == &primary_crng && crng_init < 2) { invalidate_batched_entropy(); - numa_crng_init(); + crng_init = 2; diff --git a/queue-4.16/series b/queue-4.16/series index eb7f2691023..f67bdcfc55f 100644 --- a/queue-4.16/series +++ b/queue-4.16/series @@ -162,9 +162,7 @@ alsa-hda-realtek-set-pincfg_headset_mic-to-parse_flags.patch alsa-hda-realtek-adjust-the-location-of-one-mic.patch random-fix-crng_ready-test.patch random-use-a-different-mixing-algorithm-for-add_device_randomness.patch -random-set-up-the-numa-crng-instances-after-the-crng-is-fully-initialized.patch random-crng_reseed-should-lock-the-crng-instance-that-it-is-modifying.patch -random-add-new-ioctl-rndreseedcrng.patch hid-i2c-hid-fix-resume-issue-on-raydium-touchscreen-device.patch hid-input-fix-battery-level-reporting-on-bt-mice.patch hid-hidraw-fix-crash-on-hidiocgfeature-with-a-destroyed-device.patch