X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fppc64;h=c5faf15849dbffd8059223d5206265d0d85e690a;hb=b9811866e24132aa24255cc7c5f855c1e2290d9f;hp=ccefcbbbb4d8bf81e5803ded519c9109fe357fec;hpb=b8f2cdd34626d6dceb1a18ddb48062e689f83487;p=kernel-configs.git

diff --git a/4.14/ppc64 b/4.14/ppc64
index ccefcbb..c5faf15 100644
--- a/4.14/ppc64
+++ b/4.14/ppc64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.14.270-gnu1 Kernel Configuration
+# Linux/powerpc 4.14.311-gnu1 Kernel Configuration
 #
 CONFIG_PPC64=y
 
@@ -898,6 +898,7 @@ CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
+CONFIG_INET_TABLE_PERTURB_ORDER=16
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
@@ -1445,7 +1446,6 @@ CONFIG_NET_SCH_PLUG=m
 #
 CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
@@ -1982,6 +1982,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_PARIDE=m
 
 #
@@ -2471,6 +2472,7 @@ CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_ADB_PMU=y
+CONFIG_ADB_PMU_EVENT=y
 CONFIG_ADB_PMU_LED=y
 CONFIG_ADB_PMU_LED_DISK=y
 CONFIG_PMAC_SMU=y
@@ -3410,10 +3412,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
@@ -3890,6 +3888,8 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support