commit c93d40fb422f9b26bc91939af8c8bf9a6b52be50 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sun Apr 28 14:06:40 2024 +0200
- 5.15.157 kernel-multiarch.config | 1 + kernel-x86.config | 1 + kernel.spec | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) --- diff --git a/kernel.spec b/kernel.spec index 30234b30..cb6f3d88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -65,9 +65,9 @@ %define have_pcmcia 0 %endif -%define rel 2 +%define rel 1 %define basever 5.15 -%define postver .155 +%define postver .157 # define this to '-%{basever}' for longterm branch %define versuffix -%{basever} @@ -121,7 +121,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz # Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594 %if "%{postver}" != ".0" Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz -# Patch0-md5: 4373b80f34634df1d69465a2da88c16d +# Patch0-md5: 812bb1cf31d7c31ac4d4b6e881dc277f %endif Source1: kernel.sysconfig diff --git a/kernel-multiarch.config b/kernel-multiarch.config index 16439c4d..40736cc1 100644 --- a/kernel-multiarch.config +++ b/kernel-multiarch.config @@ -13620,6 +13620,7 @@ NFT_FIB_NETDEV all=m NFT_REJECT_NETDEV all=m NF_FLOW_TABLE_INET all=m NF_FLOW_TABLE all=m +NF_FLOW_TABLE_PROCFS all=y NETFILTER_XTABLES all=m NETFILTER_XTABLES_COMPAT all=y #- Xtables combined modules diff --git a/kernel-x86.config b/kernel-x86.config index b4efbe56..4c957163 100644 --- a/kernel-x86.config +++ b/kernel-x86.config @@ -108,6 +108,7 @@ RETPOLINE x86=y SLS x86=y GDS_FORCE_MITIGATION all=n MITIGATION_RFDS x86_64=y +MITIGATION_SPECTRE_BHI x86=y x86_64=y SPECTRE_BHI_ON x86=y x86_64=y SPECTRE_BHI_OFF x86=n x86_64=n SPECTRE_BHI_AUTO x86=n x86_64=n ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/c93d40fb422f9b26bc91939af8c8bf9a6b52be50 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit