Update configs

[kernel-configs.git] / 5.4 / arm64

diff --git a/5.4/arm64 b/5.4/arm64
index 4c142e72b827a3c990a171dbf71446e0ae6f3b39..7fb19404d6148aa05ab13165bfccfedb290e5f35 100644 (file)
--- a/5.4/arm64
+++ b/5.4/arm64
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.184-gnu1 Kernel Configuration
+# Linux/arm64 5.4.196-gnu1 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gcc (GCC) 11.2.0
+# Compiler: aarch64-linux-gcc (GCC) 11.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=110200
+CONFIG_GCC_VERSION=110300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -394,6 +394,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 CONFIG_ARM64_SW_TTBR0_PAN=y
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -3834,9 +3835,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