X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=4.14%2Farm64;h=c46429d15c1ebaeeaf8b7eadb0bf4839d9bc01de;hb=430497224b279abbdd04fa1fade39f948fab5ba2;hp=363ebf402927c9021578ca7a85bf8142cf2c0b50;hpb=69fc0668c04c6f318317d39db9c3a676019f3522;p=kernel-configs.git

diff --git a/4.14/arm64 b/4.14/arm64
index 363ebf4..c46429d 100644
--- a/4.14/arm64
+++ b/4.14/arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.275-gnu1 Kernel Configuration
+# Linux/arm64 4.14.299-gnu1 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -536,6 +536,7 @@ CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1742098=y
 CONFIG_CAVIUM_ERRATUM_22375=y
 CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
@@ -3301,10 +3302,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
@@ -3792,6 +3789,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support