diff options
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 5 | ||||
| -rw-r--r-- | patch-5.20-redhat.patch | 9 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 9540f4c69..befe297fe 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c5a9d8567670100a8f427eb0e3d4a5f4cb2291f3 + c5a9d8567670100a8f427eb0e3d4a5f4cb2291f3 Fix up merge thinko + "https://gitlab.com/cki-project/kernel-ark/-/commit"/8bfbda9aac499fc13565a225c71239600f96b074 8bfbda9aac499fc13565a225c71239600f96b074 arm64: config: Enable DRM_V3D diff --git a/kernel.spec b/kernel.spec index 60ce749fe..c7bf2544c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -3138,6 +3138,11 @@ fi # # %changelog +* Wed Aug 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.20.0-0.rc0.20220803gite2b542100719.2] +- Fix up merge thinko (Justin M. Forbes) +- Fix BLAKE2S_ARM and BLAKE2S_X86 configs in pending (Justin M. Forbes) +- Fix pending for ACPI_VIDEO (Justin M. Forbes) + * Wed Aug 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.20.0-0.rc0.e2b542100719.1] - Reset release (Justin M. Forbes) - redhat/configs: Fix rm warning on config warnings (Eric Chanudet) diff --git a/patch-5.20-redhat.patch b/patch-5.20-redhat.patch index eb71e021f..370a04c37 100644 --- a/patch-5.20-redhat.patch +++ b/patch-5.20-redhat.patch @@ -67,7 +67,7 @@ kernel/bpf/syscall.c | 23 + kernel/module/main.c | 2 + kernel/module/signing.c | 9 +- - kernel/panic.c | 14 + + kernel/panic.c | 13 + kernel/rh_messages.c | 209 +++++ scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + @@ -75,7 +75,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 77 files changed, 2555 insertions(+), 233 deletions(-) + 77 files changed, 2554 insertions(+), 233 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0e990f7c2aa3..9d28feed61de 100644 @@ -3968,14 +3968,13 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/kernel/panic.c b/kernel/panic.c -index c6eb8f8db0c0..eef592767c11 100644 +index c6eb8f8db0c0..da82fb0fbb1b 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -429,6 +429,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -429,6 +429,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, [ TAINT_TEST ] = { 'N', ' ', true }, -+ [ TAINT_18 ] = { '?', '-', false }, + [ TAINT_19 ] = { '?', '-', false }, + [ TAINT_20 ] = { '?', '-', false }, + [ TAINT_21 ] = { '?', '-', false }, @@ -1,3 +1,3 @@ SHA512 (linux-5.19-2858-ge2b542100719.tar.xz) = de33d11ff951519ade93b214370f7604ca04694481797223917ad9a4865734dace6975f423f79e9d155c3f4d81420dc92434a7afa23712c856707d4c35dfc751 -SHA512 (kernel-abi-stablelists-5.20.0.tar.bz2) = a131fb99619f2fbd4ed5f7f294e3c02e000851b3c324edf83ce8483f693a9746b9ca1aa7bb9e8cfcb00e06601144c5aa305af2de3ed508e213f963a0a4ff46e5 +SHA512 (kernel-abi-stablelists-5.20.0.tar.bz2) = fb25ae14ce936586feba2c5372b26110efb54cb79bb02b0213b1f51c8f7522204e3e376306f9ee858df2fffd33591ac8d74035370d854d8bf142ebb72adbc4ea SHA512 (kernel-kabi-dw-5.20.0.tar.bz2) = 797f2105f3c984d7923e70333ef4b738c9f595bbf5a2262c9a3e0aafcac9c2a41a1453368c4d8a04207e4e01e5a9e04a4b510cbf216b02561d43815ab78caefa |