aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-08-08 19:57:20 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-08-10 21:07:50 +0200
commitec0ff928d929f076cdfb4ab1be96d2cf24c1d29b (patch)
treedd863a603628055afd3656cd63f4958d2aa4542f /target/linux/x86
parent795a5dd4529d7030fd141b9644a1752b863c2fd4 (diff)
downloadupstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.tar.gz
upstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.tar.bz2
upstream-ec0ff928d929f076cdfb4ab1be96d2cf24c1d29b.zip
kernel: bump 5.15 to 5.15.125
1. Add new symbols to generic config 2. Bump kernel Changelog: https://lore.kernel.org/stable/2023080818-groin-gradient-a031@gregkh/ All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> [Refreshed on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit daed3322d347cae5fa538907b5f1fa5d5cfc08c6)
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/config-5.152
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/x86/config-5.15 b/target/linux/x86/config-5.15
index aebe4f08c4..cf94f3bbff 100644
--- a/target/linux/x86/config-5.15
+++ b/target/linux/x86/config-5.15
@@ -66,6 +66,7 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_TRANSMETA_32=y
CONFIG_CPU_SUP_UMC_32=y
CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_CPU_SRSO=y
CONFIG_CPU_UNRET_ENTRY=y
CONFIG_CRASH_CORE=y
CONFIG_CRC16=y
@@ -116,6 +117,7 @@ CONFIG_FUSION=y
CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_SPI=y
CONFIG_FW_LOADER_PAGED_BUF=y
+# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_GENERIC_ALLOCATOR=y
CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_CLOCKEVENTS=y