X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.10%2Farmhf;h=9c57e968ca0d55d7d720a568bbdb6672d1267e8d;hb=1b580563cf84054074f9db85645f87aa0ae95e99;hp=ea288d972e65522125a878cc895553d2afcdb6d4;hpb=555edcec1bf166f41adb6c1999db917007b81124;p=kernel-configs.git

diff --git a/5.10/armhf b/5.10/armhf
index ea288d9..9c57e96 100644
--- a/5.10/armhf
+++ b/5.10/armhf
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.10.90-gnu1 Kernel Configuration
+# Linux/arm 5.10.114-gnu1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 11.2.0"
+CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 11.3.0"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110200
-CONFIG_LD_VERSION=237000000
+CONFIG_GCC_VERSION=110300
+CONFIG_LD_VERSION=238000000
 CONFIG_CLANG_VERSION=0
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
@@ -533,6 +533,7 @@ CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_SPECTRE=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
+CONFIG_HARDEN_BRANCH_HISTORY=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_VDSO=y
 CONFIG_OUTER_CACHE=y
@@ -2302,6 +2303,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_AC97=m
@@ -4069,9 +4071,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_HDLC=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-CONFIG_NVM=y
-CONFIG_NVM_PBLK=m
-# CONFIG_NVM_PBLK_DEBUG is not set
 
 #
 # Input device support
@@ -7390,6 +7389,7 @@ CONFIG_HDMI=y
 #
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y