X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=5.4%2Farm64;h=11ac114be4c336066bc29a1443148b1fa4c2cd0a;hb=96f72fae57373690e8869950726ea65d3ed16a85;hp=870da2da54e9283aadbbf57ce9b1abffec1d8c22;hpb=35497fb45f9fe9a952596eeaa41d7e044edc08d8;p=kernel-configs.git

diff --git a/5.4/arm64 b/5.4/arm64
index 870da2d..11ac114 100644
--- a/5.4/arm64
+++ b/5.4/arm64
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.165-gnu1 Kernel Configuration
+# Linux/arm64 5.4.197-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
@@ -207,6 +207,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
 CONFIG_RSEQ=y
@@ -393,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
@@ -3833,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