X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Farm64;h=a639551109805a8fb7b5142343c0436f66524de8;hb=9ff63768ff7e1f8a948761a9aad44c3fa5e97ebe;hp=782448817afb22fa25c0120d43e03dbbde760f53;hpb=3367f9bdfe902f1ff65dcae192ca77eb588be0b3;p=kernel-configs.git

diff --git a/4.14/arm64 b/4.14/arm64
index 7824488..a639551 100644
--- a/4.14/arm64
+++ b/4.14/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.273-gnu1 Kernel Configuration
+# Linux/arm64 4.14.294-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