X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Farm64;h=68b217b964d0cf4672e96fe502eff2bf7d0cf0c1;hb=9745a36731ba5afd4f9fd0e2c0da20dd6526e834;hp=38592d80d468540022bd6bc5673f1ba9d9c97c4e;hpb=61551a3b8428e6893126e84bfafb16d45df6d956;p=kernel-configs.git

diff --git a/4.14/arm64 b/4.14/arm64
index 38592d8..68b217b 100644
--- a/4.14/arm64
+++ b/4.14/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.271-gnu1 Kernel Configuration
+# Linux/arm64 4.14.292-gnu1 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -535,6 +535,7 @@ CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
+CONFIG_ARM64_ERRATUM_1188873=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -639,6 +640,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
 
@@ -3299,10 +3301,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
-CONFIG_NVM=y
-# CONFIG_NVM_DEBUG is not set
-CONFIG_NVM_RRPC=m
-CONFIG_NVM_PBLK=m
 
 #
 # Input device support
@@ -3790,6 +3788,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support