首页 发现 帮助
登录
GfA
/
linux_kernel
5
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

m68k/defconfig: Update defconfigs for v4.2-rc1

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Geert Uytterhoeven 10 年之前
父节点
d15135bd94
当前提交
519f648e15
共有 12 个文件被更改，包括 132 次插入 和 48 次删除
分列视图 显示文件统计
  1. 11 4
      arch/m68k/configs/amiga_defconfig
  2. 11 4
      arch/m68k/configs/apollo_defconfig
  3. 11 4
      arch/m68k/configs/atari_defconfig
  4. 11 4
      arch/m68k/configs/bvme6000_defconfig
  5. 11 4
      arch/m68k/configs/hp300_defconfig
  6. 11 4
      arch/m68k/configs/mac_defconfig
  7. 11 4
      arch/m68k/configs/multi_defconfig
  8. 11 4
      arch/m68k/configs/mvme147_defconfig
  9. 11 4
      arch/m68k/configs/mvme16x_defconfig
  10. 11 4
      arch/m68k/configs/q40_defconfig
  11. 11 4
      arch/m68k/configs/sun3_defconfig
  12. 11 4
      arch/m68k/configs/sun3x_defconfig

+ 11 - 4
arch/m68k/configs/amiga_defconfig
查看文件 

@@ -57,7 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -91,6 +91,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -287,7 +288,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -344,6 +344,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -354,6 +355,7 @@ CONFIG_ARIADNE=y
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 # CONFIG_NET_VENDOR_CIRRUS is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_HP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
@@ -362,6 +364,7 @@ CONFIG_HYDRA=y
 
 CONFIG_APNE=y
 
 CONFIG_ZORRO8390=y
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -447,6 +450,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -535,6 +539,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -542,6 +547,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -570,14 +576,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/apollo_defconfig
查看文件 

@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -326,17 +326,20 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -405,6 +408,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -493,6 +497,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -500,6 +505,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -528,14 +534,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/atari_defconfig
查看文件 

@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -283,7 +284,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -335,6 +335,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -342,11 +343,13 @@ CONFIG_ATARILANCE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 CONFIG_NE2000=y
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -427,6 +430,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -515,6 +519,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -522,6 +527,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -550,14 +556,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/bvme6000_defconfig
查看文件 

@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -325,17 +325,20 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 CONFIG_BVME6000_NET=y
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/hp300_defconfig
查看文件 

@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -326,6 +326,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -333,11 +334,13 @@ CONFIG_HPLANCE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -407,6 +410,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -495,6 +499,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -502,6 +507,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -530,14 +536,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/mac_defconfig
查看文件 

@@ -54,7 +54,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -88,6 +88,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -282,7 +283,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -342,6 +342,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -350,12 +351,14 @@ CONFIG_MACMACE=y
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 CONFIG_MAC89x0=y
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 CONFIG_MACSONIC=y
 
 CONFIG_MAC8390=y
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -429,6 +432,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -517,6 +521,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -524,6 +529,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -552,14 +558,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/multi_defconfig
查看文件 

@@ -64,7 +64,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -98,6 +98,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -301,7 +302,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -375,6 +375,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -390,6 +391,7 @@ CONFIG_MACMACE=y
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 CONFIG_MAC89x0=y
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_HP is not set
 
 CONFIG_BVME6000_NET=y
 
 CONFIG_MVME16x_NET=y
 
@@ -402,6 +404,7 @@ CONFIG_NE2000=y
 
 CONFIG_APNE=y
 
 CONFIG_ZORRO8390=y
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -509,6 +512,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -597,6 +601,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -604,6 +609,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -632,14 +638,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/mvme147_defconfig
查看文件 

@@ -52,7 +52,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -86,6 +86,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -276,7 +277,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -324,6 +324,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -331,11 +332,13 @@ CONFIG_MVME147_NET=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/mvme16x_defconfig
查看文件 

@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -325,17 +325,20 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 CONFIG_MVME16x_NET=y
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/q40_defconfig
查看文件 

@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -280,7 +281,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -331,6 +331,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -340,12 +341,14 @@ CONFIG_VETH=m
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
 # CONFIG_NET_VENDOR_CIRRUS is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_HP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 CONFIG_NE2000=y
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -420,6 +423,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -508,6 +512,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -515,6 +520,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -543,14 +549,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/sun3_defconfig
查看文件 

@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -322,17 +322,20 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
 CONFIG_SUN3LANCE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 CONFIG_SUN3_82586=y
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -399,6 +402,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -486,6 +490,7 @@ CONFIG_TEST_BPF=m
 
 CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m

+ 11 - 4
arch/m68k/configs/sun3x_defconfig
查看文件 

@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m
 
 CONFIG_NET_IPGRE=m
 
 CONFIG_NET_IPVTI=m
 
 CONFIG_NET_FOU_IP_TUNNELS=y
 
-CONFIG_GENEVE=m
 
+CONFIG_GENEVE_CORE=m
 
 CONFIG_INET_AH=m
 
 CONFIG_INET_ESP=m
 
 CONFIG_INET_IPCOMP=m
 
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m
 
 CONFIG_NF_CONNTRACK_TFTP=m
 
 CONFIG_NF_TABLES=m
 
 CONFIG_NF_TABLES_INET=m
 
+CONFIG_NF_TABLES_NETDEV=m
 
 CONFIG_NFT_EXTHDR=m
 
 CONFIG_NFT_META=m
 
 CONFIG_NFT_CT=m
 
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 
 CONFIG_BLK_DEV_DRBD=m
 
 CONFIG_BLK_DEV_NBD=m
 
 CONFIG_BLK_DEV_RAM=y
 
-CONFIG_BLK_DEV_PMEM=m
 
 CONFIG_CDROM_PKTCDVD=m
 
 CONFIG_ATA_OVER_ETH=m
 
 CONFIG_DUMMY_IRQ=m
 
@@ -322,6 +322,7 @@ CONFIG_MACVLAN=m
 
 CONFIG_MACVTAP=m
 
 CONFIG_IPVLAN=m
 
 CONFIG_VXLAN=m
 
+CONFIG_GENEVE=m
 
 CONFIG_NETCONSOLE=m
 
 CONFIG_NETCONSOLE_DYNAMIC=y
 
 CONFIG_VETH=m
 
@@ -329,11 +330,13 @@ CONFIG_SUN3LANCE=y
 
 # CONFIG_NET_VENDOR_ARC is not set
 
 # CONFIG_NET_CADENCE is not set
 
 # CONFIG_NET_VENDOR_BROADCOM is not set
 
+# CONFIG_NET_VENDOR_EZCHIP is not set
 
 # CONFIG_NET_VENDOR_INTEL is not set
 
 # CONFIG_NET_VENDOR_MARVELL is not set
 
 # CONFIG_NET_VENDOR_MICREL is not set
 
 # CONFIG_NET_VENDOR_NATSEMI is not set
 
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 
+# CONFIG_NET_VENDOR_RENESAS is not set
 
 # CONFIG_NET_VENDOR_ROCKER is not set
 
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 
 # CONFIG_NET_VENDOR_SEEQ is not set
 
@@ -399,6 +402,7 @@ CONFIG_UDF_FS=m
 
 CONFIG_MSDOS_FS=m
 
 CONFIG_VFAT_FS=m
 
 CONFIG_PROC_KCORE=y
 
+CONFIG_PROC_CHILDREN=y
 
 CONFIG_TMPFS=y
 
 CONFIG_AFFS_FS=m
 
 CONFIG_ECRYPT_FS=m
 
@@ -487,6 +491,7 @@ CONFIG_TEST_FIRMWARE=m
 
 CONFIG_TEST_UDELAY=m
 
 CONFIG_EARLY_PRINTK=y
 
 CONFIG_ENCRYPTED_KEYS=m
 
+CONFIG_CRYPTO_RSA=m
 
 CONFIG_CRYPTO_MANAGER=y
 
 CONFIG_CRYPTO_USER=m
 
 CONFIG_CRYPTO_CRYPTD=m
 
@@ -494,6 +499,7 @@ CONFIG_CRYPTO_MCRYPTD=m
 
 CONFIG_CRYPTO_TEST=m
 
 CONFIG_CRYPTO_CCM=m
 
 CONFIG_CRYPTO_GCM=m
 
+CONFIG_CRYPTO_CHACHA20POLY1305=m
 
 CONFIG_CRYPTO_CTS=m
 
 CONFIG_CRYPTO_LRW=m
 
 CONFIG_CRYPTO_PCBC=m
 
@@ -522,14 +528,15 @@ CONFIG_CRYPTO_TEA=m
 
 CONFIG_CRYPTO_TWOFISH=m
 
 CONFIG_CRYPTO_ZLIB=m
 
 CONFIG_CRYPTO_LZO=m
 
+CONFIG_CRYPTO_842=m
 
 CONFIG_CRYPTO_LZ4=m
 
 CONFIG_CRYPTO_LZ4HC=m
 
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
 
-CONFIG_CRYPTO_DRBG_MENU=m
 
+CONFIG_CRYPTO_ANSI_CPRNG=m
 
 CONFIG_CRYPTO_DRBG_HASH=y
 
 CONFIG_CRYPTO_DRBG_CTR=y
 
 CONFIG_CRYPTO_USER_API_HASH=m
 
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
 
 CONFIG_CRYPTO_USER_API_RNG=m
 
+CONFIG_CRYPTO_USER_API_AEAD=m
 
 # CONFIG_CRYPTO_HW is not set
 
 CONFIG_XZ_DEC_TEST=m