X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=4.14%2Fm68k;h=e078f7c4e14c159b79f2c3a6036d71402031481b;hb=af1b4e88fe23dd4714eea8b26ccce5bab98d759a;hp=40412c9d56fdbef5b3d3319f5af4140366417708;hpb=15d67f6dd2fff64a5b1328a589fca4ab7344eda8;p=kernel-configs.git

diff --git a/4.14/m68k b/4.14/m68k
index 40412c9..e078f7c 100644
--- a/4.14/m68k
+++ b/4.14/m68k
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 4.14.260-gnu1 Kernel Configuration
+# Linux/m68k 4.14.317-gnu1 Kernel Configuration
 #
 CONFIG_M68K=y
 CONFIG_CPU_BIG_ENDIAN=y
@@ -140,6 +140,7 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 CONFIG_USERFAULTFD=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
@@ -405,6 +406,7 @@ CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 # CONFIG_INET_ESP_OFFLOAD is not set
 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
@@ -912,7 +914,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
@@ -1520,7 +1521,6 @@ CONFIG_SLIP_MODE_SLIP6=y
 #
 # CONFIG_WAN is not set
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -1692,6 +1692,7 @@ CONFIG_NVRAM=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
@@ -1892,7 +1893,6 @@ CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m