From c5983ad1c59bdfe8718a2b1f2bbcdbd4a0571e8e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 16 Apr 2026 12:36:02 -0600 Subject: [PATCH] kernel-7.1.0-0.rc0.260416g1d51b370a0f8.65 * Thu Apr 16 2026 Fedora Kernel Team [7.1.0-0.rc0.1d51b370a0f8.65] - add man-page for rv-mon-stall (Thorsten Leemhuis) - disable selftests by default for now (Thorsten Leemhuis) Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 3 +++ patch-7.1-redhat.patch | 12 +++++------- sources | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 0a9dff9a9..9b05d6d80 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/82dafda39bdd2fa076811bdb6613c4365d882bf3 + 82dafda39bdd2fa076811bdb6613c4365d882bf3 Correct manual merge error in crypto/rng.c + https://gitlab.com/cki-project/kernel-ark/-/commit/96cfc00a6c84f3d03d5a95d68f21b4266ce23f5c 96cfc00a6c84f3d03d5a95d68f21b4266ce23f5c Fix up rebase typo in drivers/pci/quirks.c diff --git a/kernel.spec b/kernel.spec index 0a3345d45..bd21c51f4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4835,6 +4835,9 @@ fi\ # # %changelog +* Thu Apr 16 2026 Justin M. Forbes [7.1.0-0.rc0.260416g1d51b370a0f8.65] +- Correct manual merge error in crypto/rng.c (Patrick Talbert) + * Thu Apr 16 2026 Fedora Kernel Team [7.1.0-0.rc0.1d51b370a0f8.65] - add man-page for rv-mon-stall (Thorsten Leemhuis) - disable selftests by default for now (Thorsten Leemhuis) diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index e7fcf638e..6f4b423d5 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -14,7 +14,7 @@ crypto/akcipher.c | 3 +- crypto/dh.c | 25 + crypto/drbg.c | 18 +- - crypto/rng.c | 157 +++++- + crypto/rng.c | 155 +++++- crypto/seqiv.c | 15 +- crypto/sig.c | 3 +- crypto/testmgr.c | 6 +- @@ -78,7 +78,7 @@ security/lockdown/lockdown.c | 11 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 80 files changed, 2825 insertions(+), 244 deletions(-) + 80 files changed, 2824 insertions(+), 243 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 4510b4b3c416..812e622c41d5 100644 @@ -670,7 +670,7 @@ index 9204e6edb426..5c10baf70071 100644 /* diff --git a/crypto/rng.c b/crypto/rng.c -index 1d4b9177bad4..f79246f8b690 100644 +index 1d4b9177bad4..d9ca86086946 100644 --- a/crypto/rng.c +++ b/crypto/rng.c @@ -12,10 +12,13 @@ @@ -687,19 +687,17 @@ index 1d4b9177bad4..f79246f8b690 100644 #include #include #include -@@ -23,8 +26,10 @@ +@@ -23,7 +26,9 @@ #include "internal.h" -static DEFINE_MUTEX(crypto_default_rng_lock); --static struct crypto_rng *crypto_default_rng; +static ____cacheline_aligned_in_smp DEFINE_MUTEX(crypto_reseed_rng_lock); +static struct crypto_rng *crypto_reseed_rng; +static ____cacheline_aligned_in_smp DEFINE_MUTEX(crypto_default_rng_lock); -+struct static crypto_rng *crypto_default_rng; + static struct crypto_rng *crypto_default_rng; static int crypto_default_rng_refcnt; - int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) @@ -105,31 +110,37 @@ struct crypto_rng *crypto_alloc_rng(const char *alg_name, u32 type, u32 mask) } EXPORT_SYMBOL_GPL(crypto_alloc_rng); diff --git a/sources b/sources index 765d07879..0e5fcfb8d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-7.0-8391-g1d51b370a0f8.tar.xz) = 617faeade23e66f722432c200ec3fdbd38b5210b99a9e938f9a5c3fdefed080147ea63d0452c1726c1c818c168d57f0dea8ea88276cdd464d56ed64e91e511e9 -SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = 56962addcabc266860f265eb5396baab31a68edafdc44c2a6cebc5d95a716c43a05730a9ec34644cb67e756632d9600a119ad67e7b9a7d89f5c4a9170e5cacd0 +SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = fc3647be2b51388ab9c10b57a5319c3d58d8e4f70f4a72e1e3b94db5e02da5deb6977168769fea9fc2c3a7ed6233996881dbc6823b7bf025721faa546903439d SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 12609fd15fac15526e8eeb1a97af1709de07a869b76d5b2b069540689ac7642001ec364897209c21663a20e41442e01264a936154e5e56370b5e22a7d469368b