From 605002842f2b4ed5429c3f40c7dcfe169288f751 Mon Sep 17 00:00:00 2001 From: Raven Date: Wed, 17 Apr 2024 13:09:11 +0600 Subject: [PATCH] kernel-rx: upgrade to 5.15.154 --- .../{config-5.15.153-x86_64 => config-5.15.154-x86_64} | 8 ++++++-- kernel-rx/kernel-rx.spec | 7 +++++-- ...-5.15-153-redhat.patch => patch-5.15-154-redhat.patch} | 0 3 files changed, 11 insertions(+), 4 deletions(-) rename kernel-rx/{config-5.15.153-x86_64 => config-5.15.154-x86_64} (99%) rename kernel-rx/{patch-5.15-153-redhat.patch => patch-5.15-154-redhat.patch} (100%) diff --git a/kernel-rx/config-5.15.153-x86_64 b/kernel-rx/config-5.15.154-x86_64 similarity index 99% rename from kernel-rx/config-5.15.153-x86_64 rename to kernel-rx/config-5.15.154-x86_64 index 8569c7c..d0a11ed 100644 --- a/kernel-rx/config-5.15.153-x86_64 +++ b/kernel-rx/config-5.15.154-x86_64 @@ -30,6 +30,10 @@ CONFIG_GCC_PLUGINS=y # General setup # CONFIG_SPECULATION_MITIGATIONS=y +CONFIG_MITIGATION_RFDS=y +CONFIG_SPECTRE_BHI_ON=y +# CONFIG_SPECTRE_BHI_OFF is not set +# CONFIG_SPECTRE_BHI_AUTO is not set CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set @@ -7736,7 +7740,7 @@ CONFIG_NFS_DEBUG=y CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFS_V4_2_READ_PLUS is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y +# CONFIG_NFSD_V2 is not set CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y @@ -7744,7 +7748,7 @@ CONFIG_NFSD_PNFS=y # CONFIG_NFSD_BLOCKLAYOUT is not set CONFIG_NFSD_SCSILAYOUT=y # CONFIG_NFSD_FLEXFILELAYOUT is not set -CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_2_INTER_SSC is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_GRACE_PERIOD=m CONFIG_LOCKD=m diff --git a/kernel-rx/kernel-rx.spec b/kernel-rx/kernel-rx.spec index 3f6f6e3..db64d46 100644 --- a/kernel-rx/kernel-rx.spec +++ b/kernel-rx/kernel-rx.spec @@ -2,9 +2,9 @@ %undefine __brp_mangle_shebangs # Define the version of the Linux Kernel Archive tarball. -%define LKAver 5.15.153 +%define LKAver 5.15.154 -%define patchversion 5.15-153 +%define patchversion 5.15-154 %define variant %{?build_variant:%{build_variant}}%{!?build_variant:-rx} @@ -1263,6 +1263,9 @@ fi %endif %changelog +* Thu Apr 11 2024 Raven - 5.15.154-1 +- update to 5.15.154 + * Sat Apr 6 2024 Raven - 5.15.153-1 - update to 5.15.153 diff --git a/kernel-rx/patch-5.15-153-redhat.patch b/kernel-rx/patch-5.15-154-redhat.patch similarity index 100% rename from kernel-rx/patch-5.15-153-redhat.patch rename to kernel-rx/patch-5.15-154-redhat.patch