[packages/kernel/LINUX_6_1] Up to 6.1.82; RFDS mitigation
arekm
arekm at pld-linux.org
Sun Mar 17 01:51:26 CET 2024
commit 6132e97dbec20ecc1fb0720c751cc58e2ef288c8
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 16 23:53:18 2024 +0100
Up to 6.1.82; RFDS mitigation
kernel-multiarch.config | 14 ++++++++------
kernel-x86.config | 1 +
kernel.spec | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c47e7578..0228b927 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@
%define rel 1
%define basever 6.1
-%define postver .80
+%define postver .82
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -121,7 +121,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: 4bf0fb69c6574a8b984b1394531b18cb
+# Patch0-md5: ae966e65d2dda4421151071a288689e1
%endif
Source1: kernel.sysconfig
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 56fa403d..fc5a8eaa 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -92,6 +92,7 @@ DEBUG_TLBFLUSH all=n
DEBUG_USER arm=n
EARLY_PRINTK_DBGP all=n
EARLY_PRINTK_USB_XDBC all=n
+EFI_HANDOVER_PROTOCOL all=y
EFI_PGT_DUMP all=n
HAVE_STACK_VALIDATION all=y
IOMMU_DEBUG all=n
@@ -6696,7 +6697,6 @@ DNET all=m
#- file drivers/net/ethernet/i825xx/Kconfig goes here
#- file drivers/net/ethernet/ibm/Kconfig goes here
#- file drivers/net/ethernet/intel/Kconfig goes here
-#- file drivers/net/ethernet/wangxun/Kconfig goes here
#- file drivers/net/ethernet/xscale/Kconfig goes here
JME all=m
#- file drivers/net/ethernet/adi/Kconfig goes here
@@ -6748,6 +6748,7 @@ ETHOC all=m
#- file drivers/net/ethernet/tundra/Kconfig goes here
#- file drivers/net/ethernet/vertexcom/Kconfig goes here
#- file drivers/net/ethernet/via/Kconfig goes here
+#- file drivers/net/ethernet/wangxun/Kconfig goes here
#- file drivers/net/ethernet/wiznet/Kconfig goes here
#- file drivers/net/ethernet/xilinx/Kconfig goes here
#- file drivers/net/ethernet/xircom/Kconfig goes here
@@ -12430,6 +12431,7 @@ NFS_DISABLE_UDP_SUPPORT all=y
#- *** FILE: fs/nfsd/Kconfig ***
#-
NFSD all=m
+NFSD_V2 all=y
NFSD_V2_ACL all=y
NFSD_V3_ACL all=y
NFSD_V4 all=y
@@ -14415,10 +14417,8 @@ RXKAD all=y
#-
NET_SCHED all=y
#- Queueing/Scheduling
-NET_SCH_CBQ all=m
NET_SCH_HTB all=m
NET_SCH_HFSC all=m
-NET_SCH_ATM all=m
NET_SCH_PRIO all=m
NET_SCH_MULTIQ all=m
NET_SCH_RED all=m
@@ -14430,7 +14430,6 @@ NET_SCH_CBS all=m
NET_SCH_ETF all=m
NET_SCH_TAPRIO all=m
NET_SCH_GRED all=m
-NET_SCH_DSMARK all=m
NET_SCH_NETEM all=m
NET_SCH_DRR all=m
NET_SCH_MQPRIO all=m
@@ -14462,8 +14461,6 @@ NET_CLS_FW all=m
NET_CLS_U32 all=m
CLS_U32_PERF all=y
CLS_U32_MARK all=y
-NET_CLS_RSVP all=m
-NET_CLS_RSVP6 all=m
NET_CLS_FLOW all=m
NET_CLS_CGROUP all=y
NET_CLS_BPF all=m
@@ -15744,7 +15741,12 @@ RD_ZSTD all=y
#-
#- *** PROBABLY REMOVED OPTIONS ***
#-
+NET_CLS_RSVP all=m
+NET_CLS_RSVP6 all=m
NET_CLS_TCINDEX all=m
+NET_SCH_ATM all=m
+NET_SCH_CBQ all=m
+NET_SCH_DSMARK all=m
SND_BCM2708_SOC_HIFIBERRY_DAC arm=m arm64=m
SND_RPI_SIMPLE_SOUNDCARD arm=m arm64=m
SND_RPI_WM8804_SOUNDCARD arm=m arm64=m
diff --git a/kernel-x86.config b/kernel-x86.config
index ef738105..0f32b173 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -127,6 +127,7 @@ CPU_IBRS_ENTRY x86_64=y
CPU_SRSO x86_64=y
SLS x86_64=y
GDS_FORCE_MITIGATION x86_64=n
+MITIGATION_RFDS x86_64=y
#- file kernel/power/Kconfig goes here
#- file drivers/acpi/Kconfig goes here
APM i386=m
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6132e97dbec20ecc1fb0720c751cc58e2ef288c8
More information about the pld-cvs-commit
mailing list