aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-31 17:52:45 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-31 17:52:45 -0400
commit9551bf292d67e9070409b59685cdb8fc5437ec3a (patch)
treeb44a047855b70ad786461bb5f2bf6ee6f86b2c7b
parent4ff12049d6b6cc79ad8ee092ae226434687062ec (diff)
parent1ecb40643a9af05683b7a898d7141884bcb28a82 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/bootinfo: Use kmemdup rather than duplicating its implementation m68k/defconfig: Update defconfigs for v4.2-rc1 m68k/defconfig: Disable experimental CONFIG_DM_CACHE
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig16
-rw-r--r--arch/m68k/configs/apollo_defconfig16
-rw-r--r--arch/m68k/configs/atari_defconfig16
-rw-r--r--arch/m68k/configs/bvme6000_defconfig16
-rw-r--r--arch/m68k/configs/hp300_defconfig16
-rw-r--r--arch/m68k/configs/mac_defconfig16
-rw-r--r--arch/m68k/configs/multi_defconfig16
-rw-r--r--arch/m68k/configs/mvme147_defconfig16
-rw-r--r--arch/m68k/configs/mvme16x_defconfig16
-rw-r--r--arch/m68k/configs/q40_defconfig16
-rw-r--r--arch/m68k/configs/sun3_defconfig16
-rw-r--r--arch/m68k/configs/sun3x_defconfig16
-rw-r--r--arch/m68k/kernel/bootinfo_proc.c4
13 files changed, 133 insertions, 63 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 753a6237f99a..0b6b40d37b95 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -57,7 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m
57CONFIG_NET_IPGRE=m 57CONFIG_NET_IPGRE=m
58CONFIG_NET_IPVTI=m 58CONFIG_NET_IPVTI=m
59CONFIG_NET_FOU_IP_TUNNELS=y 59CONFIG_NET_FOU_IP_TUNNELS=y
60CONFIG_GENEVE=m 60CONFIG_GENEVE_CORE=m
61CONFIG_INET_AH=m 61CONFIG_INET_AH=m
62CONFIG_INET_ESP=m 62CONFIG_INET_ESP=m
63CONFIG_INET_IPCOMP=m 63CONFIG_INET_IPCOMP=m
@@ -91,6 +91,7 @@ CONFIG_NF_CONNTRACK_SIP=m
91CONFIG_NF_CONNTRACK_TFTP=m 91CONFIG_NF_CONNTRACK_TFTP=m
92CONFIG_NF_TABLES=m 92CONFIG_NF_TABLES=m
93CONFIG_NF_TABLES_INET=m 93CONFIG_NF_TABLES_INET=m
94CONFIG_NF_TABLES_NETDEV=m
94CONFIG_NFT_EXTHDR=m 95CONFIG_NFT_EXTHDR=m
95CONFIG_NFT_META=m 96CONFIG_NFT_META=m
96CONFIG_NFT_CT=m 97CONFIG_NFT_CT=m
@@ -287,7 +288,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
287CONFIG_BLK_DEV_DRBD=m 288CONFIG_BLK_DEV_DRBD=m
288CONFIG_BLK_DEV_NBD=m 289CONFIG_BLK_DEV_NBD=m
289CONFIG_BLK_DEV_RAM=y 290CONFIG_BLK_DEV_RAM=y
290CONFIG_BLK_DEV_PMEM=m
291CONFIG_CDROM_PKTCDVD=m 291CONFIG_CDROM_PKTCDVD=m
292CONFIG_ATA_OVER_ETH=m 292CONFIG_ATA_OVER_ETH=m
293CONFIG_DUMMY_IRQ=m 293CONFIG_DUMMY_IRQ=m
@@ -320,7 +320,6 @@ CONFIG_BLK_DEV_DM=m
320CONFIG_DM_CRYPT=m 320CONFIG_DM_CRYPT=m
321CONFIG_DM_SNAPSHOT=m 321CONFIG_DM_SNAPSHOT=m
322CONFIG_DM_THIN_PROVISIONING=m 322CONFIG_DM_THIN_PROVISIONING=m
323CONFIG_DM_CACHE=m
324CONFIG_DM_ERA=m 323CONFIG_DM_ERA=m
325CONFIG_DM_MIRROR=m 324CONFIG_DM_MIRROR=m
326CONFIG_DM_RAID=m 325CONFIG_DM_RAID=m
@@ -345,6 +344,7 @@ CONFIG_MACVLAN=m
345CONFIG_MACVTAP=m 344CONFIG_MACVTAP=m
346CONFIG_IPVLAN=m 345CONFIG_IPVLAN=m
347CONFIG_VXLAN=m 346CONFIG_VXLAN=m
347CONFIG_GENEVE=m
348CONFIG_NETCONSOLE=m 348CONFIG_NETCONSOLE=m
349CONFIG_NETCONSOLE_DYNAMIC=y 349CONFIG_NETCONSOLE_DYNAMIC=y
350CONFIG_VETH=m 350CONFIG_VETH=m
@@ -355,6 +355,7 @@ CONFIG_ARIADNE=y
355# CONFIG_NET_CADENCE is not set 355# CONFIG_NET_CADENCE is not set
356# CONFIG_NET_VENDOR_BROADCOM is not set 356# CONFIG_NET_VENDOR_BROADCOM is not set
357# CONFIG_NET_VENDOR_CIRRUS is not set 357# CONFIG_NET_VENDOR_CIRRUS is not set
358# CONFIG_NET_VENDOR_EZCHIP is not set
358# CONFIG_NET_VENDOR_HP is not set 359# CONFIG_NET_VENDOR_HP is not set
359# CONFIG_NET_VENDOR_INTEL is not set 360# CONFIG_NET_VENDOR_INTEL is not set
360# CONFIG_NET_VENDOR_MARVELL is not set 361# CONFIG_NET_VENDOR_MARVELL is not set
@@ -363,6 +364,7 @@ CONFIG_HYDRA=y
363CONFIG_APNE=y 364CONFIG_APNE=y
364CONFIG_ZORRO8390=y 365CONFIG_ZORRO8390=y
365# CONFIG_NET_VENDOR_QUALCOMM is not set 366# CONFIG_NET_VENDOR_QUALCOMM is not set
367# CONFIG_NET_VENDOR_RENESAS is not set
366# CONFIG_NET_VENDOR_ROCKER is not set 368# CONFIG_NET_VENDOR_ROCKER is not set
367# CONFIG_NET_VENDOR_SAMSUNG is not set 369# CONFIG_NET_VENDOR_SAMSUNG is not set
368# CONFIG_NET_VENDOR_SEEQ is not set 370# CONFIG_NET_VENDOR_SEEQ is not set
@@ -448,6 +450,7 @@ CONFIG_UDF_FS=m
448CONFIG_MSDOS_FS=m 450CONFIG_MSDOS_FS=m
449CONFIG_VFAT_FS=m 451CONFIG_VFAT_FS=m
450CONFIG_PROC_KCORE=y 452CONFIG_PROC_KCORE=y
453CONFIG_PROC_CHILDREN=y
451CONFIG_TMPFS=y 454CONFIG_TMPFS=y
452CONFIG_AFFS_FS=m 455CONFIG_AFFS_FS=m
453CONFIG_ECRYPT_FS=m 456CONFIG_ECRYPT_FS=m
@@ -536,6 +539,7 @@ CONFIG_TEST_FIRMWARE=m
536CONFIG_TEST_UDELAY=m 539CONFIG_TEST_UDELAY=m
537CONFIG_EARLY_PRINTK=y 540CONFIG_EARLY_PRINTK=y
538CONFIG_ENCRYPTED_KEYS=m 541CONFIG_ENCRYPTED_KEYS=m
542CONFIG_CRYPTO_RSA=m
539CONFIG_CRYPTO_MANAGER=y 543CONFIG_CRYPTO_MANAGER=y
540CONFIG_CRYPTO_USER=m 544CONFIG_CRYPTO_USER=m
541CONFIG_CRYPTO_CRYPTD=m 545CONFIG_CRYPTO_CRYPTD=m
@@ -543,6 +547,7 @@ CONFIG_CRYPTO_MCRYPTD=m
543CONFIG_CRYPTO_TEST=m 547CONFIG_CRYPTO_TEST=m
544CONFIG_CRYPTO_CCM=m 548CONFIG_CRYPTO_CCM=m
545CONFIG_CRYPTO_GCM=m 549CONFIG_CRYPTO_GCM=m
550CONFIG_CRYPTO_CHACHA20POLY1305=m
546CONFIG_CRYPTO_CTS=m 551CONFIG_CRYPTO_CTS=m
547CONFIG_CRYPTO_LRW=m 552CONFIG_CRYPTO_LRW=m
548CONFIG_CRYPTO_PCBC=m 553CONFIG_CRYPTO_PCBC=m
@@ -571,14 +576,15 @@ CONFIG_CRYPTO_TEA=m
571CONFIG_CRYPTO_TWOFISH=m 576CONFIG_CRYPTO_TWOFISH=m
572CONFIG_CRYPTO_ZLIB=m 577CONFIG_CRYPTO_ZLIB=m
573CONFIG_CRYPTO_LZO=m 578CONFIG_CRYPTO_LZO=m
579CONFIG_CRYPTO_842=m
574CONFIG_CRYPTO_LZ4=m 580CONFIG_CRYPTO_LZ4=m
575CONFIG_CRYPTO_LZ4HC=m 581CONFIG_CRYPTO_LZ4HC=m
576# CONFIG_CRYPTO_ANSI_CPRNG is not set 582CONFIG_CRYPTO_ANSI_CPRNG=m
577CONFIG_CRYPTO_DRBG_MENU=m
578CONFIG_CRYPTO_DRBG_HASH=y 583CONFIG_CRYPTO_DRBG_HASH=y
579CONFIG_CRYPTO_DRBG_CTR=y 584CONFIG_CRYPTO_DRBG_CTR=y
580CONFIG_CRYPTO_USER_API_HASH=m 585CONFIG_CRYPTO_USER_API_HASH=m
581CONFIG_CRYPTO_USER_API_SKCIPHER=m 586CONFIG_CRYPTO_USER_API_SKCIPHER=m
582CONFIG_CRYPTO_USER_API_RNG=m 587CONFIG_CRYPTO_USER_API_RNG=m
588CONFIG_CRYPTO_USER_API_AEAD=m
583# CONFIG_CRYPTO_HW is not set 589# CONFIG_CRYPTO_HW is not set
584CONFIG_XZ_DEC_TEST=m 590CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 1f93dcaf02e5..eeb3a8991fc4 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
55CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y 57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m 58CONFIG_GENEVE_CORE=m
59CONFIG_INET_AH=m 59CONFIG_INET_AH=m
60CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
61CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
89CONFIG_NF_CONNTRACK_TFTP=m 89CONFIG_NF_CONNTRACK_TFTP=m
90CONFIG_NF_TABLES=m 90CONFIG_NF_TABLES=m
91CONFIG_NF_TABLES_INET=m 91CONFIG_NF_TABLES_INET=m
92CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 93CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 94CONFIG_NFT_META=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
279CONFIG_BLK_DEV_DRBD=m 280CONFIG_BLK_DEV_DRBD=m
280CONFIG_BLK_DEV_NBD=m 281CONFIG_BLK_DEV_NBD=m
281CONFIG_BLK_DEV_RAM=y 282CONFIG_BLK_DEV_RAM=y
282CONFIG_BLK_DEV_PMEM=m
283CONFIG_CDROM_PKTCDVD=m 283CONFIG_CDROM_PKTCDVD=m
284CONFIG_ATA_OVER_ETH=m 284CONFIG_ATA_OVER_ETH=m
285CONFIG_DUMMY_IRQ=m 285CONFIG_DUMMY_IRQ=m
@@ -302,7 +302,6 @@ CONFIG_BLK_DEV_DM=m
302CONFIG_DM_CRYPT=m 302CONFIG_DM_CRYPT=m
303CONFIG_DM_SNAPSHOT=m 303CONFIG_DM_SNAPSHOT=m
304CONFIG_DM_THIN_PROVISIONING=m 304CONFIG_DM_THIN_PROVISIONING=m
305CONFIG_DM_CACHE=m
306CONFIG_DM_ERA=m 305CONFIG_DM_ERA=m
307CONFIG_DM_MIRROR=m 306CONFIG_DM_MIRROR=m
308CONFIG_DM_RAID=m 307CONFIG_DM_RAID=m
@@ -327,17 +326,20 @@ CONFIG_MACVLAN=m
327CONFIG_MACVTAP=m 326CONFIG_MACVTAP=m
328CONFIG_IPVLAN=m 327CONFIG_IPVLAN=m
329CONFIG_VXLAN=m 328CONFIG_VXLAN=m
329CONFIG_GENEVE=m
330CONFIG_NETCONSOLE=m 330CONFIG_NETCONSOLE=m
331CONFIG_NETCONSOLE_DYNAMIC=y 331CONFIG_NETCONSOLE_DYNAMIC=y
332CONFIG_VETH=m 332CONFIG_VETH=m
333# CONFIG_NET_VENDOR_ARC is not set 333# CONFIG_NET_VENDOR_ARC is not set
334# CONFIG_NET_CADENCE is not set 334# CONFIG_NET_CADENCE is not set
335# CONFIG_NET_VENDOR_BROADCOM is not set 335# CONFIG_NET_VENDOR_BROADCOM is not set
336# CONFIG_NET_VENDOR_EZCHIP is not set
336# CONFIG_NET_VENDOR_INTEL is not set 337# CONFIG_NET_VENDOR_INTEL is not set
337# CONFIG_NET_VENDOR_MARVELL is not set 338# CONFIG_NET_VENDOR_MARVELL is not set
338# CONFIG_NET_VENDOR_MICREL is not set 339# CONFIG_NET_VENDOR_MICREL is not set
339# CONFIG_NET_VENDOR_NATSEMI is not set 340# CONFIG_NET_VENDOR_NATSEMI is not set
340# CONFIG_NET_VENDOR_QUALCOMM is not set 341# CONFIG_NET_VENDOR_QUALCOMM is not set
342# CONFIG_NET_VENDOR_RENESAS is not set
341# CONFIG_NET_VENDOR_ROCKER is not set 343# CONFIG_NET_VENDOR_ROCKER is not set
342# CONFIG_NET_VENDOR_SAMSUNG is not set 344# CONFIG_NET_VENDOR_SAMSUNG is not set
343# CONFIG_NET_VENDOR_SEEQ is not set 345# CONFIG_NET_VENDOR_SEEQ is not set
@@ -406,6 +408,7 @@ CONFIG_UDF_FS=m
406CONFIG_MSDOS_FS=m 408CONFIG_MSDOS_FS=m
407CONFIG_VFAT_FS=m 409CONFIG_VFAT_FS=m
408CONFIG_PROC_KCORE=y 410CONFIG_PROC_KCORE=y
411CONFIG_PROC_CHILDREN=y
409CONFIG_TMPFS=y 412CONFIG_TMPFS=y
410CONFIG_AFFS_FS=m 413CONFIG_AFFS_FS=m
411CONFIG_ECRYPT_FS=m 414CONFIG_ECRYPT_FS=m
@@ -494,6 +497,7 @@ CONFIG_TEST_FIRMWARE=m
494CONFIG_TEST_UDELAY=m 497CONFIG_TEST_UDELAY=m
495CONFIG_EARLY_PRINTK=y 498CONFIG_EARLY_PRINTK=y
496CONFIG_ENCRYPTED_KEYS=m 499CONFIG_ENCRYPTED_KEYS=m
500CONFIG_CRYPTO_RSA=m
497CONFIG_CRYPTO_MANAGER=y 501CONFIG_CRYPTO_MANAGER=y
498CONFIG_CRYPTO_USER=m 502CONFIG_CRYPTO_USER=m
499CONFIG_CRYPTO_CRYPTD=m 503CONFIG_CRYPTO_CRYPTD=m
@@ -501,6 +505,7 @@ CONFIG_CRYPTO_MCRYPTD=m
501CONFIG_CRYPTO_TEST=m 505CONFIG_CRYPTO_TEST=m
502CONFIG_CRYPTO_CCM=m 506CONFIG_CRYPTO_CCM=m
503CONFIG_CRYPTO_GCM=m 507CONFIG_CRYPTO_GCM=m
508CONFIG_CRYPTO_CHACHA20POLY1305=m
504CONFIG_CRYPTO_CTS=m 509CONFIG_CRYPTO_CTS=m
505CONFIG_CRYPTO_LRW=m 510CONFIG_CRYPTO_LRW=m
506CONFIG_CRYPTO_PCBC=m 511CONFIG_CRYPTO_PCBC=m
@@ -529,14 +534,15 @@ CONFIG_CRYPTO_TEA=m
529CONFIG_CRYPTO_TWOFISH=m 534CONFIG_CRYPTO_TWOFISH=m
530CONFIG_CRYPTO_ZLIB=m 535CONFIG_CRYPTO_ZLIB=m
531CONFIG_CRYPTO_LZO=m 536CONFIG_CRYPTO_LZO=m
537CONFIG_CRYPTO_842=m
532CONFIG_CRYPTO_LZ4=m 538CONFIG_CRYPTO_LZ4=m
533CONFIG_CRYPTO_LZ4HC=m 539CONFIG_CRYPTO_LZ4HC=m
534# CONFIG_CRYPTO_ANSI_CPRNG is not set 540CONFIG_CRYPTO_ANSI_CPRNG=m
535CONFIG_CRYPTO_DRBG_MENU=m
536CONFIG_CRYPTO_DRBG_HASH=y 541CONFIG_CRYPTO_DRBG_HASH=y
537CONFIG_CRYPTO_DRBG_CTR=y 542CONFIG_CRYPTO_DRBG_CTR=y
538CONFIG_CRYPTO_USER_API_HASH=m 543CONFIG_CRYPTO_USER_API_HASH=m
539CONFIG_CRYPTO_USER_API_SKCIPHER=m 544CONFIG_CRYPTO_USER_API_SKCIPHER=m
540CONFIG_CRYPTO_USER_API_RNG=m 545CONFIG_CRYPTO_USER_API_RNG=m
546CONFIG_CRYPTO_USER_API_AEAD=m
541# CONFIG_CRYPTO_HW is not set 547# CONFIG_CRYPTO_HW is not set
542CONFIG_XZ_DEC_TEST=m 548CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 831b8b8b92ad..3a7006654ce9 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
55CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y 57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m 58CONFIG_GENEVE_CORE=m
59CONFIG_INET_AH=m 59CONFIG_INET_AH=m
60CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
61CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
89CONFIG_NF_CONNTRACK_TFTP=m 89CONFIG_NF_CONNTRACK_TFTP=m
90CONFIG_NF_TABLES=m 90CONFIG_NF_TABLES=m
91CONFIG_NF_TABLES_INET=m 91CONFIG_NF_TABLES_INET=m
92CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 93CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 94CONFIG_NFT_META=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
@@ -283,7 +284,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
283CONFIG_BLK_DEV_DRBD=m 284CONFIG_BLK_DEV_DRBD=m
284CONFIG_BLK_DEV_NBD=m 285CONFIG_BLK_DEV_NBD=m
285CONFIG_BLK_DEV_RAM=y 286CONFIG_BLK_DEV_RAM=y
286CONFIG_BLK_DEV_PMEM=m
287CONFIG_CDROM_PKTCDVD=m 287CONFIG_CDROM_PKTCDVD=m
288CONFIG_ATA_OVER_ETH=m 288CONFIG_ATA_OVER_ETH=m
289CONFIG_DUMMY_IRQ=m 289CONFIG_DUMMY_IRQ=m
@@ -311,7 +311,6 @@ CONFIG_BLK_DEV_DM=m
311CONFIG_DM_CRYPT=m 311CONFIG_DM_CRYPT=m
312CONFIG_DM_SNAPSHOT=m 312CONFIG_DM_SNAPSHOT=m
313CONFIG_DM_THIN_PROVISIONING=m 313CONFIG_DM_THIN_PROVISIONING=m
314CONFIG_DM_CACHE=m
315CONFIG_DM_ERA=m 314CONFIG_DM_ERA=m
316CONFIG_DM_MIRROR=m 315CONFIG_DM_MIRROR=m
317CONFIG_DM_RAID=m 316CONFIG_DM_RAID=m
@@ -336,6 +335,7 @@ CONFIG_MACVLAN=m
336CONFIG_MACVTAP=m 335CONFIG_MACVTAP=m
337CONFIG_IPVLAN=m 336CONFIG_IPVLAN=m
338CONFIG_VXLAN=m 337CONFIG_VXLAN=m
338CONFIG_GENEVE=m
339CONFIG_NETCONSOLE=m 339CONFIG_NETCONSOLE=m
340CONFIG_NETCONSOLE_DYNAMIC=y 340CONFIG_NETCONSOLE_DYNAMIC=y
341CONFIG_VETH=m 341CONFIG_VETH=m
@@ -343,11 +343,13 @@ CONFIG_ATARILANCE=y
343# CONFIG_NET_VENDOR_ARC is not set 343# CONFIG_NET_VENDOR_ARC is not set
344# CONFIG_NET_CADENCE is not set 344# CONFIG_NET_CADENCE is not set
345# CONFIG_NET_VENDOR_BROADCOM is not set 345# CONFIG_NET_VENDOR_BROADCOM is not set
346# CONFIG_NET_VENDOR_EZCHIP is not set
346# CONFIG_NET_VENDOR_INTEL is not set 347# CONFIG_NET_VENDOR_INTEL is not set
347# CONFIG_NET_VENDOR_MARVELL is not set 348# CONFIG_NET_VENDOR_MARVELL is not set
348# CONFIG_NET_VENDOR_MICREL is not set 349# CONFIG_NET_VENDOR_MICREL is not set
349CONFIG_NE2000=y 350CONFIG_NE2000=y
350# CONFIG_NET_VENDOR_QUALCOMM is not set 351# CONFIG_NET_VENDOR_QUALCOMM is not set
352# CONFIG_NET_VENDOR_RENESAS is not set
351# CONFIG_NET_VENDOR_ROCKER is not set 353# CONFIG_NET_VENDOR_ROCKER is not set
352# CONFIG_NET_VENDOR_SAMSUNG is not set 354# CONFIG_NET_VENDOR_SAMSUNG is not set
353# CONFIG_NET_VENDOR_SEEQ is not set 355# CONFIG_NET_VENDOR_SEEQ is not set
@@ -428,6 +430,7 @@ CONFIG_UDF_FS=m
428CONFIG_MSDOS_FS=m 430CONFIG_MSDOS_FS=m
429CONFIG_VFAT_FS=m 431CONFIG_VFAT_FS=m
430CONFIG_PROC_KCORE=y 432CONFIG_PROC_KCORE=y
433CONFIG_PROC_CHILDREN=y
431CONFIG_TMPFS=y 434CONFIG_TMPFS=y
432CONFIG_AFFS_FS=m 435CONFIG_AFFS_FS=m
433CONFIG_ECRYPT_FS=m 436CONFIG_ECRYPT_FS=m
@@ -516,6 +519,7 @@ CONFIG_TEST_FIRMWARE=m
516CONFIG_TEST_UDELAY=m 519CONFIG_TEST_UDELAY=m
517CONFIG_EARLY_PRINTK=y 520CONFIG_EARLY_PRINTK=y
518CONFIG_ENCRYPTED_KEYS=m 521CONFIG_ENCRYPTED_KEYS=m
522CONFIG_CRYPTO_RSA=m
519CONFIG_CRYPTO_MANAGER=y 523CONFIG_CRYPTO_MANAGER=y
520CONFIG_CRYPTO_USER=m 524CONFIG_CRYPTO_USER=m
521CONFIG_CRYPTO_CRYPTD=m 525CONFIG_CRYPTO_CRYPTD=m
@@ -523,6 +527,7 @@ CONFIG_CRYPTO_MCRYPTD=m
523CONFIG_CRYPTO_TEST=m 527CONFIG_CRYPTO_TEST=m
524CONFIG_CRYPTO_CCM=m 528CONFIG_CRYPTO_CCM=m
525CONFIG_CRYPTO_GCM=m 529CONFIG_CRYPTO_GCM=m
530CONFIG_CRYPTO_CHACHA20POLY1305=m
526CONFIG_CRYPTO_CTS=m 531CONFIG_CRYPTO_CTS=m
527CONFIG_CRYPTO_LRW=m 532CONFIG_CRYPTO_LRW=m
528CONFIG_CRYPTO_PCBC=m 533CONFIG_CRYPTO_PCBC=m
@@ -551,14 +556,15 @@ CONFIG_CRYPTO_TEA=m
551CONFIG_CRYPTO_TWOFISH=m 556CONFIG_CRYPTO_TWOFISH=m
552CONFIG_CRYPTO_ZLIB=m 557CONFIG_CRYPTO_ZLIB=m
553CONFIG_CRYPTO_LZO=m 558CONFIG_CRYPTO_LZO=m
559CONFIG_CRYPTO_842=m
554CONFIG_CRYPTO_LZ4=m 560CONFIG_CRYPTO_LZ4=m
555CONFIG_CRYPTO_LZ4HC=m 561CONFIG_CRYPTO_LZ4HC=m
556# CONFIG_CRYPTO_ANSI_CPRNG is not set 562CONFIG_CRYPTO_ANSI_CPRNG=m
557CONFIG_CRYPTO_DRBG_MENU=m
558CONFIG_CRYPTO_DRBG_HASH=y 563CONFIG_CRYPTO_DRBG_HASH=y
559CONFIG_CRYPTO_DRBG_CTR=y 564CONFIG_CRYPTO_DRBG_CTR=y
560CONFIG_CRYPTO_USER_API_HASH=m 565CONFIG_CRYPTO_USER_API_HASH=m
561CONFIG_CRYPTO_USER_API_SKCIPHER=m 566CONFIG_CRYPTO_USER_API_SKCIPHER=m
562CONFIG_CRYPTO_USER_API_RNG=m 567CONFIG_CRYPTO_USER_API_RNG=m
568CONFIG_CRYPTO_USER_API_AEAD=m
563# CONFIG_CRYPTO_HW is not set 569# CONFIG_CRYPTO_HW is not set
564CONFIG_XZ_DEC_TEST=m 570CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 91fd187c16d5..0586b323a673 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
53CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
54CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y 55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m 56CONFIG_GENEVE_CORE=m
57CONFIG_INET_AH=m 57CONFIG_INET_AH=m
58CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
59CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
87CONFIG_NF_CONNTRACK_TFTP=m 87CONFIG_NF_CONNTRACK_TFTP=m
88CONFIG_NF_TABLES=m 88CONFIG_NF_TABLES=m
89CONFIG_NF_TABLES_INET=m 89CONFIG_NF_TABLES_INET=m
90CONFIG_NF_TABLES_NETDEV=m
90CONFIG_NFT_EXTHDR=m 91CONFIG_NFT_EXTHDR=m
91CONFIG_NFT_META=m 92CONFIG_NFT_META=m
92CONFIG_NFT_CT=m 93CONFIG_NFT_CT=m
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277CONFIG_BLK_DEV_DRBD=m 278CONFIG_BLK_DEV_DRBD=m
278CONFIG_BLK_DEV_NBD=m 279CONFIG_BLK_DEV_NBD=m
279CONFIG_BLK_DEV_RAM=y 280CONFIG_BLK_DEV_RAM=y
280CONFIG_BLK_DEV_PMEM=m
281CONFIG_CDROM_PKTCDVD=m 281CONFIG_CDROM_PKTCDVD=m
282CONFIG_ATA_OVER_ETH=m 282CONFIG_ATA_OVER_ETH=m
283CONFIG_DUMMY_IRQ=m 283CONFIG_DUMMY_IRQ=m
@@ -301,7 +301,6 @@ CONFIG_BLK_DEV_DM=m
301CONFIG_DM_CRYPT=m 301CONFIG_DM_CRYPT=m
302CONFIG_DM_SNAPSHOT=m 302CONFIG_DM_SNAPSHOT=m
303CONFIG_DM_THIN_PROVISIONING=m 303CONFIG_DM_THIN_PROVISIONING=m
304CONFIG_DM_CACHE=m
305CONFIG_DM_ERA=m 304CONFIG_DM_ERA=m
306CONFIG_DM_MIRROR=m 305CONFIG_DM_MIRROR=m
307CONFIG_DM_RAID=m 306CONFIG_DM_RAID=m
@@ -326,17 +325,20 @@ CONFIG_MACVLAN=m
326CONFIG_MACVTAP=m 325CONFIG_MACVTAP=m
327CONFIG_IPVLAN=m 326CONFIG_IPVLAN=m
328CONFIG_VXLAN=m 327CONFIG_VXLAN=m
328CONFIG_GENEVE=m
329CONFIG_NETCONSOLE=m 329CONFIG_NETCONSOLE=m
330CONFIG_NETCONSOLE_DYNAMIC=y 330CONFIG_NETCONSOLE_DYNAMIC=y
331CONFIG_VETH=m 331CONFIG_VETH=m
332# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set 333# CONFIG_NET_CADENCE is not set
334# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
335# CONFIG_NET_VENDOR_EZCHIP is not set
335CONFIG_BVME6000_NET=y 336CONFIG_BVME6000_NET=y
336# CONFIG_NET_VENDOR_MARVELL is not set 337# CONFIG_NET_VENDOR_MARVELL is not set
337# CONFIG_NET_VENDOR_MICREL is not set 338# CONFIG_NET_VENDOR_MICREL is not set
338# CONFIG_NET_VENDOR_NATSEMI is not set 339# CONFIG_NET_VENDOR_NATSEMI is not set
339# CONFIG_NET_VENDOR_QUALCOMM is not set 340# CONFIG_NET_VENDOR_QUALCOMM is not set
341# CONFIG_NET_VENDOR_RENESAS is not set
340# CONFIG_NET_VENDOR_ROCKER is not set 342# CONFIG_NET_VENDOR_ROCKER is not set
341# CONFIG_NET_VENDOR_SAMSUNG is not set 343# CONFIG_NET_VENDOR_SAMSUNG is not set
342# CONFIG_NET_VENDOR_SEEQ is not set 344# CONFIG_NET_VENDOR_SEEQ is not set
@@ -399,6 +401,7 @@ CONFIG_UDF_FS=m
399CONFIG_MSDOS_FS=m 401CONFIG_MSDOS_FS=m
400CONFIG_VFAT_FS=m 402CONFIG_VFAT_FS=m
401CONFIG_PROC_KCORE=y 403CONFIG_PROC_KCORE=y
404CONFIG_PROC_CHILDREN=y
402CONFIG_TMPFS=y 405CONFIG_TMPFS=y
403CONFIG_AFFS_FS=m 406CONFIG_AFFS_FS=m
404CONFIG_ECRYPT_FS=m 407CONFIG_ECRYPT_FS=m
@@ -487,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
487CONFIG_TEST_UDELAY=m 490CONFIG_TEST_UDELAY=m
488CONFIG_EARLY_PRINTK=y 491CONFIG_EARLY_PRINTK=y
489CONFIG_ENCRYPTED_KEYS=m 492CONFIG_ENCRYPTED_KEYS=m
493CONFIG_CRYPTO_RSA=m
490CONFIG_CRYPTO_MANAGER=y 494CONFIG_CRYPTO_MANAGER=y
491CONFIG_CRYPTO_USER=m 495CONFIG_CRYPTO_USER=m
492CONFIG_CRYPTO_CRYPTD=m 496CONFIG_CRYPTO_CRYPTD=m
@@ -494,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
494CONFIG_CRYPTO_TEST=m 498CONFIG_CRYPTO_TEST=m
495CONFIG_CRYPTO_CCM=m 499CONFIG_CRYPTO_CCM=m
496CONFIG_CRYPTO_GCM=m 500CONFIG_CRYPTO_GCM=m
501CONFIG_CRYPTO_CHACHA20POLY1305=m
497CONFIG_CRYPTO_CTS=m 502CONFIG_CRYPTO_CTS=m
498CONFIG_CRYPTO_LRW=m 503CONFIG_CRYPTO_LRW=m
499CONFIG_CRYPTO_PCBC=m 504CONFIG_CRYPTO_PCBC=m
@@ -522,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
522CONFIG_CRYPTO_TWOFISH=m 527CONFIG_CRYPTO_TWOFISH=m
523CONFIG_CRYPTO_ZLIB=m 528CONFIG_CRYPTO_ZLIB=m
524CONFIG_CRYPTO_LZO=m 529CONFIG_CRYPTO_LZO=m
530CONFIG_CRYPTO_842=m
525CONFIG_CRYPTO_LZ4=m 531CONFIG_CRYPTO_LZ4=m
526CONFIG_CRYPTO_LZ4HC=m 532CONFIG_CRYPTO_LZ4HC=m
527# CONFIG_CRYPTO_ANSI_CPRNG is not set 533CONFIG_CRYPTO_ANSI_CPRNG=m
528CONFIG_CRYPTO_DRBG_MENU=m
529CONFIG_CRYPTO_DRBG_HASH=y 534CONFIG_CRYPTO_DRBG_HASH=y
530CONFIG_CRYPTO_DRBG_CTR=y 535CONFIG_CRYPTO_DRBG_CTR=y
531CONFIG_CRYPTO_USER_API_HASH=m 536CONFIG_CRYPTO_USER_API_HASH=m
532CONFIG_CRYPTO_USER_API_SKCIPHER=m 537CONFIG_CRYPTO_USER_API_SKCIPHER=m
533CONFIG_CRYPTO_USER_API_RNG=m 538CONFIG_CRYPTO_USER_API_RNG=m
539CONFIG_CRYPTO_USER_API_AEAD=m
534# CONFIG_CRYPTO_HW is not set 540# CONFIG_CRYPTO_HW is not set
535CONFIG_XZ_DEC_TEST=m 541CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 9d4934f1d2c3..ad1dbce07aa4 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m
55CONFIG_NET_IPGRE=m 55CONFIG_NET_IPGRE=m
56CONFIG_NET_IPVTI=m 56CONFIG_NET_IPVTI=m
57CONFIG_NET_FOU_IP_TUNNELS=y 57CONFIG_NET_FOU_IP_TUNNELS=y
58CONFIG_GENEVE=m 58CONFIG_GENEVE_CORE=m
59CONFIG_INET_AH=m 59CONFIG_INET_AH=m
60CONFIG_INET_ESP=m 60CONFIG_INET_ESP=m
61CONFIG_INET_IPCOMP=m 61CONFIG_INET_IPCOMP=m
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m
89CONFIG_NF_CONNTRACK_TFTP=m 89CONFIG_NF_CONNTRACK_TFTP=m
90CONFIG_NF_TABLES=m 90CONFIG_NF_TABLES=m
91CONFIG_NF_TABLES_INET=m 91CONFIG_NF_TABLES_INET=m
92CONFIG_NF_TABLES_NETDEV=m
92CONFIG_NFT_EXTHDR=m 93CONFIG_NFT_EXTHDR=m
93CONFIG_NFT_META=m 94CONFIG_NFT_META=m
94CONFIG_NFT_CT=m 95CONFIG_NFT_CT=m
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
279CONFIG_BLK_DEV_DRBD=m 280CONFIG_BLK_DEV_DRBD=m
280CONFIG_BLK_DEV_NBD=m 281CONFIG_BLK_DEV_NBD=m
281CONFIG_BLK_DEV_RAM=y 282CONFIG_BLK_DEV_RAM=y
282CONFIG_BLK_DEV_PMEM=m
283CONFIG_CDROM_PKTCDVD=m 283CONFIG_CDROM_PKTCDVD=m
284CONFIG_ATA_OVER_ETH=m 284CONFIG_ATA_OVER_ETH=m
285CONFIG_DUMMY_IRQ=m 285CONFIG_DUMMY_IRQ=m
@@ -302,7 +302,6 @@ CONFIG_BLK_DEV_DM=m
302CONFIG_DM_CRYPT=m 302CONFIG_DM_CRYPT=m
303CONFIG_DM_SNAPSHOT=m 303CONFIG_DM_SNAPSHOT=m
304CONFIG_DM_THIN_PROVISIONING=m 304CONFIG_DM_THIN_PROVISIONING=m
305CONFIG_DM_CACHE=m
306CONFIG_DM_ERA=m 305CONFIG_DM_ERA=m
307CONFIG_DM_MIRROR=m 306CONFIG_DM_MIRROR=m
308CONFIG_DM_RAID=m 307CONFIG_DM_RAID=m
@@ -327,6 +326,7 @@ CONFIG_MACVLAN=m
327CONFIG_MACVTAP=m 326CONFIG_MACVTAP=m
328CONFIG_IPVLAN=m 327CONFIG_IPVLAN=m
329CONFIG_VXLAN=m 328CONFIG_VXLAN=m
329CONFIG_GENEVE=m
330CONFIG_NETCONSOLE=m 330CONFIG_NETCONSOLE=m
331CONFIG_NETCONSOLE_DYNAMIC=y 331CONFIG_NETCONSOLE_DYNAMIC=y
332CONFIG_VETH=m 332CONFIG_VETH=m
@@ -334,11 +334,13 @@ CONFIG_HPLANCE=y
334# CONFIG_NET_VENDOR_ARC is not set 334# CONFIG_NET_VENDOR_ARC is not set
335# CONFIG_NET_CADENCE is not set 335# CONFIG_NET_CADENCE is not set
336# CONFIG_NET_VENDOR_BROADCOM is not set 336# CONFIG_NET_VENDOR_BROADCOM is not set
337# CONFIG_NET_VENDOR_EZCHIP is not set
337# CONFIG_NET_VENDOR_INTEL is not set 338# CONFIG_NET_VENDOR_INTEL is not set
338# CONFIG_NET_VENDOR_MARVELL is not set 339# CONFIG_NET_VENDOR_MARVELL is not set
339# CONFIG_NET_VENDOR_MICREL is not set 340# CONFIG_NET_VENDOR_MICREL is not set
340# CONFIG_NET_VENDOR_NATSEMI is not set 341# CONFIG_NET_VENDOR_NATSEMI is not set
341# CONFIG_NET_VENDOR_QUALCOMM is not set 342# CONFIG_NET_VENDOR_QUALCOMM is not set
343# CONFIG_NET_VENDOR_RENESAS is not set
342# CONFIG_NET_VENDOR_ROCKER is not set 344# CONFIG_NET_VENDOR_ROCKER is not set
343# CONFIG_NET_VENDOR_SAMSUNG is not set 345# CONFIG_NET_VENDOR_SAMSUNG is not set
344# CONFIG_NET_VENDOR_SEEQ is not set 346# CONFIG_NET_VENDOR_SEEQ is not set
@@ -408,6 +410,7 @@ CONFIG_UDF_FS=m
408CONFIG_MSDOS_FS=m 410CONFIG_MSDOS_FS=m
409CONFIG_VFAT_FS=m 411CONFIG_VFAT_FS=m
410CONFIG_PROC_KCORE=y 412CONFIG_PROC_KCORE=y
413CONFIG_PROC_CHILDREN=y
411CONFIG_TMPFS=y 414CONFIG_TMPFS=y
412CONFIG_AFFS_FS=m 415CONFIG_AFFS_FS=m
413CONFIG_ECRYPT_FS=m 416CONFIG_ECRYPT_FS=m
@@ -496,6 +499,7 @@ CONFIG_TEST_FIRMWARE=m
496CONFIG_TEST_UDELAY=m 499CONFIG_TEST_UDELAY=m
497CONFIG_EARLY_PRINTK=y 500CONFIG_EARLY_PRINTK=y
498CONFIG_ENCRYPTED_KEYS=m 501CONFIG_ENCRYPTED_KEYS=m
502CONFIG_CRYPTO_RSA=m
499CONFIG_CRYPTO_MANAGER=y 503CONFIG_CRYPTO_MANAGER=y
500CONFIG_CRYPTO_USER=m 504CONFIG_CRYPTO_USER=m
501CONFIG_CRYPTO_CRYPTD=m 505CONFIG_CRYPTO_CRYPTD=m
@@ -503,6 +507,7 @@ CONFIG_CRYPTO_MCRYPTD=m
503CONFIG_CRYPTO_TEST=m 507CONFIG_CRYPTO_TEST=m
504CONFIG_CRYPTO_CCM=m 508CONFIG_CRYPTO_CCM=m
505CONFIG_CRYPTO_GCM=m 509CONFIG_CRYPTO_GCM=m
510CONFIG_CRYPTO_CHACHA20POLY1305=m
506CONFIG_CRYPTO_CTS=m 511CONFIG_CRYPTO_CTS=m
507CONFIG_CRYPTO_LRW=m 512CONFIG_CRYPTO_LRW=m
508CONFIG_CRYPTO_PCBC=m 513CONFIG_CRYPTO_PCBC=m
@@ -531,14 +536,15 @@ CONFIG_CRYPTO_TEA=m
531CONFIG_CRYPTO_TWOFISH=m 536CONFIG_CRYPTO_TWOFISH=m
532CONFIG_CRYPTO_ZLIB=m 537CONFIG_CRYPTO_ZLIB=m
533CONFIG_CRYPTO_LZO=m 538CONFIG_CRYPTO_LZO=m
539CONFIG_CRYPTO_842=m
534CONFIG_CRYPTO_LZ4=m 540CONFIG_CRYPTO_LZ4=m
535CONFIG_CRYPTO_LZ4HC=m 541CONFIG_CRYPTO_LZ4HC=m
536# CONFIG_CRYPTO_ANSI_CPRNG is not set 542CONFIG_CRYPTO_ANSI_CPRNG=m
537CONFIG_CRYPTO_DRBG_MENU=m
538CONFIG_CRYPTO_DRBG_HASH=y 543CONFIG_CRYPTO_DRBG_HASH=y
539CONFIG_CRYPTO_DRBG_CTR=y 544CONFIG_CRYPTO_DRBG_CTR=y
540CONFIG_CRYPTO_USER_API_HASH=m 545CONFIG_CRYPTO_USER_API_HASH=m
541CONFIG_CRYPTO_USER_API_SKCIPHER=m 546CONFIG_CRYPTO_USER_API_SKCIPHER=m
542CONFIG_CRYPTO_USER_API_RNG=m 547CONFIG_CRYPTO_USER_API_RNG=m
548CONFIG_CRYPTO_USER_API_AEAD=m
543# CONFIG_CRYPTO_HW is not set 549# CONFIG_CRYPTO_HW is not set
544CONFIG_XZ_DEC_TEST=m 550CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 72bc187ca995..b44acacaecf4 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -54,7 +54,7 @@ CONFIG_NET_IPGRE_DEMUX=m
54CONFIG_NET_IPGRE=m 54CONFIG_NET_IPGRE=m
55CONFIG_NET_IPVTI=m 55CONFIG_NET_IPVTI=m
56CONFIG_NET_FOU_IP_TUNNELS=y 56CONFIG_NET_FOU_IP_TUNNELS=y
57CONFIG_GENEVE=m 57CONFIG_GENEVE_CORE=m
58CONFIG_INET_AH=m 58CONFIG_INET_AH=m
59CONFIG_INET_ESP=m 59CONFIG_INET_ESP=m
60CONFIG_INET_IPCOMP=m 60CONFIG_INET_IPCOMP=m
@@ -88,6 +88,7 @@ CONFIG_NF_CONNTRACK_SIP=m
88CONFIG_NF_CONNTRACK_TFTP=m 88CONFIG_NF_CONNTRACK_TFTP=m
89CONFIG_NF_TABLES=m 89CONFIG_NF_TABLES=m
90CONFIG_NF_TABLES_INET=m 90CONFIG_NF_TABLES_INET=m
91CONFIG_NF_TABLES_NETDEV=m
91CONFIG_NFT_EXTHDR=m 92CONFIG_NFT_EXTHDR=m
92CONFIG_NFT_META=m 93CONFIG_NFT_META=m
93CONFIG_NFT_CT=m 94CONFIG_NFT_CT=m
@@ -282,7 +283,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
282CONFIG_BLK_DEV_DRBD=m 283CONFIG_BLK_DEV_DRBD=m
283CONFIG_BLK_DEV_NBD=m 284CONFIG_BLK_DEV_NBD=m
284CONFIG_BLK_DEV_RAM=y 285CONFIG_BLK_DEV_RAM=y
285CONFIG_BLK_DEV_PMEM=m
286CONFIG_CDROM_PKTCDVD=m 286CONFIG_CDROM_PKTCDVD=m
287CONFIG_ATA_OVER_ETH=m 287CONFIG_ATA_OVER_ETH=m
288CONFIG_DUMMY_IRQ=m 288CONFIG_DUMMY_IRQ=m
@@ -311,7 +311,6 @@ CONFIG_BLK_DEV_DM=m
311CONFIG_DM_CRYPT=m 311CONFIG_DM_CRYPT=m
312CONFIG_DM_SNAPSHOT=m 312CONFIG_DM_SNAPSHOT=m
313CONFIG_DM_THIN_PROVISIONING=m 313CONFIG_DM_THIN_PROVISIONING=m
314CONFIG_DM_CACHE=m
315CONFIG_DM_ERA=m 314CONFIG_DM_ERA=m
316CONFIG_DM_MIRROR=m 315CONFIG_DM_MIRROR=m
317CONFIG_DM_RAID=m 316CONFIG_DM_RAID=m
@@ -343,6 +342,7 @@ CONFIG_MACVLAN=m
343CONFIG_MACVTAP=m 342CONFIG_MACVTAP=m
344CONFIG_IPVLAN=m 343CONFIG_IPVLAN=m
345CONFIG_VXLAN=m 344CONFIG_VXLAN=m
345CONFIG_GENEVE=m
346CONFIG_NETCONSOLE=m 346CONFIG_NETCONSOLE=m
347CONFIG_NETCONSOLE_DYNAMIC=y 347CONFIG_NETCONSOLE_DYNAMIC=y
348CONFIG_VETH=m 348CONFIG_VETH=m
@@ -351,12 +351,14 @@ CONFIG_MACMACE=y
351# CONFIG_NET_CADENCE is not set 351# CONFIG_NET_CADENCE is not set
352# CONFIG_NET_VENDOR_BROADCOM is not set 352# CONFIG_NET_VENDOR_BROADCOM is not set
353CONFIG_MAC89x0=y 353CONFIG_MAC89x0=y
354# CONFIG_NET_VENDOR_EZCHIP is not set
354# CONFIG_NET_VENDOR_INTEL is not set 355# CONFIG_NET_VENDOR_INTEL is not set
355# CONFIG_NET_VENDOR_MARVELL is not set 356# CONFIG_NET_VENDOR_MARVELL is not set
356# CONFIG_NET_VENDOR_MICREL is not set 357# CONFIG_NET_VENDOR_MICREL is not set
357CONFIG_MACSONIC=y 358CONFIG_MACSONIC=y
358CONFIG_MAC8390=y 359CONFIG_MAC8390=y
359# CONFIG_NET_VENDOR_QUALCOMM is not set 360# CONFIG_NET_VENDOR_QUALCOMM is not set
361# CONFIG_NET_VENDOR_RENESAS is not set
360# CONFIG_NET_VENDOR_ROCKER is not set 362# CONFIG_NET_VENDOR_ROCKER is not set
361# CONFIG_NET_VENDOR_SAMSUNG is not set 363# CONFIG_NET_VENDOR_SAMSUNG is not set
362# CONFIG_NET_VENDOR_SEEQ is not set 364# CONFIG_NET_VENDOR_SEEQ is not set
@@ -430,6 +432,7 @@ CONFIG_UDF_FS=m
430CONFIG_MSDOS_FS=m 432CONFIG_MSDOS_FS=m
431CONFIG_VFAT_FS=m 433CONFIG_VFAT_FS=m
432CONFIG_PROC_KCORE=y 434CONFIG_PROC_KCORE=y
435CONFIG_PROC_CHILDREN=y
433CONFIG_TMPFS=y 436CONFIG_TMPFS=y
434CONFIG_AFFS_FS=m 437CONFIG_AFFS_FS=m
435CONFIG_ECRYPT_FS=m 438CONFIG_ECRYPT_FS=m
@@ -518,6 +521,7 @@ CONFIG_TEST_FIRMWARE=m
518CONFIG_TEST_UDELAY=m 521CONFIG_TEST_UDELAY=m
519CONFIG_EARLY_PRINTK=y 522CONFIG_EARLY_PRINTK=y
520CONFIG_ENCRYPTED_KEYS=m 523CONFIG_ENCRYPTED_KEYS=m
524CONFIG_CRYPTO_RSA=m
521CONFIG_CRYPTO_MANAGER=y 525CONFIG_CRYPTO_MANAGER=y
522CONFIG_CRYPTO_USER=m 526CONFIG_CRYPTO_USER=m
523CONFIG_CRYPTO_CRYPTD=m 527CONFIG_CRYPTO_CRYPTD=m
@@ -525,6 +529,7 @@ CONFIG_CRYPTO_MCRYPTD=m
525CONFIG_CRYPTO_TEST=m 529CONFIG_CRYPTO_TEST=m
526CONFIG_CRYPTO_CCM=m 530CONFIG_CRYPTO_CCM=m
527CONFIG_CRYPTO_GCM=m 531CONFIG_CRYPTO_GCM=m
532CONFIG_CRYPTO_CHACHA20POLY1305=m
528CONFIG_CRYPTO_CTS=m 533CONFIG_CRYPTO_CTS=m
529CONFIG_CRYPTO_LRW=m 534CONFIG_CRYPTO_LRW=m
530CONFIG_CRYPTO_PCBC=m 535CONFIG_CRYPTO_PCBC=m
@@ -553,14 +558,15 @@ CONFIG_CRYPTO_TEA=m
553CONFIG_CRYPTO_TWOFISH=m 558CONFIG_CRYPTO_TWOFISH=m
554CONFIG_CRYPTO_ZLIB=m 559CONFIG_CRYPTO_ZLIB=m
555CONFIG_CRYPTO_LZO=m 560CONFIG_CRYPTO_LZO=m
561CONFIG_CRYPTO_842=m
556CONFIG_CRYPTO_LZ4=m 562CONFIG_CRYPTO_LZ4=m
557CONFIG_CRYPTO_LZ4HC=m 563CONFIG_CRYPTO_LZ4HC=m
558# CONFIG_CRYPTO_ANSI_CPRNG is not set 564CONFIG_CRYPTO_ANSI_CPRNG=m
559CONFIG_CRYPTO_DRBG_MENU=m
560CONFIG_CRYPTO_DRBG_HASH=y 565CONFIG_CRYPTO_DRBG_HASH=y
561CONFIG_CRYPTO_DRBG_CTR=y 566CONFIG_CRYPTO_DRBG_CTR=y
562CONFIG_CRYPTO_USER_API_HASH=m 567CONFIG_CRYPTO_USER_API_HASH=m
563CONFIG_CRYPTO_USER_API_SKCIPHER=m 568CONFIG_CRYPTO_USER_API_SKCIPHER=m
564CONFIG_CRYPTO_USER_API_RNG=m 569CONFIG_CRYPTO_USER_API_RNG=m
570CONFIG_CRYPTO_USER_API_AEAD=m
565# CONFIG_CRYPTO_HW is not set 571# CONFIG_CRYPTO_HW is not set
566CONFIG_XZ_DEC_TEST=m 572CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 8fb65535597f..8afca3753db1 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -64,7 +64,7 @@ CONFIG_NET_IPGRE_DEMUX=m
64CONFIG_NET_IPGRE=m 64CONFIG_NET_IPGRE=m
65CONFIG_NET_IPVTI=m 65CONFIG_NET_IPVTI=m
66CONFIG_NET_FOU_IP_TUNNELS=y 66CONFIG_NET_FOU_IP_TUNNELS=y
67CONFIG_GENEVE=m 67CONFIG_GENEVE_CORE=m
68CONFIG_INET_AH=m 68CONFIG_INET_AH=m
69CONFIG_INET_ESP=m 69CONFIG_INET_ESP=m
70CONFIG_INET_IPCOMP=m 70CONFIG_INET_IPCOMP=m
@@ -98,6 +98,7 @@ CONFIG_NF_CONNTRACK_SIP=m
98CONFIG_NF_CONNTRACK_TFTP=m 98CONFIG_NF_CONNTRACK_TFTP=m
99CONFIG_NF_TABLES=m 99CONFIG_NF_TABLES=m
100CONFIG_NF_TABLES_INET=m 100CONFIG_NF_TABLES_INET=m
101CONFIG_NF_TABLES_NETDEV=m
101CONFIG_NFT_EXTHDR=m 102CONFIG_NFT_EXTHDR=m
102CONFIG_NFT_META=m 103CONFIG_NFT_META=m
103CONFIG_NFT_CT=m 104CONFIG_NFT_CT=m
@@ -301,7 +302,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
301CONFIG_BLK_DEV_DRBD=m 302CONFIG_BLK_DEV_DRBD=m
302CONFIG_BLK_DEV_NBD=m 303CONFIG_BLK_DEV_NBD=m
303CONFIG_BLK_DEV_RAM=y 304CONFIG_BLK_DEV_RAM=y
304CONFIG_BLK_DEV_PMEM=m
305CONFIG_CDROM_PKTCDVD=m 305CONFIG_CDROM_PKTCDVD=m
306CONFIG_ATA_OVER_ETH=m 306CONFIG_ATA_OVER_ETH=m
307CONFIG_DUMMY_IRQ=m 307CONFIG_DUMMY_IRQ=m
@@ -344,7 +344,6 @@ CONFIG_BLK_DEV_DM=m
344CONFIG_DM_CRYPT=m 344CONFIG_DM_CRYPT=m
345CONFIG_DM_SNAPSHOT=m 345CONFIG_DM_SNAPSHOT=m
346CONFIG_DM_THIN_PROVISIONING=m 346CONFIG_DM_THIN_PROVISIONING=m
347CONFIG_DM_CACHE=m
348CONFIG_DM_ERA=m 347CONFIG_DM_ERA=m
349CONFIG_DM_MIRROR=m 348CONFIG_DM_MIRROR=m
350CONFIG_DM_RAID=m 349CONFIG_DM_RAID=m
@@ -376,6 +375,7 @@ CONFIG_MACVLAN=m
376CONFIG_MACVTAP=m 375CONFIG_MACVTAP=m
377CONFIG_IPVLAN=m 376CONFIG_IPVLAN=m
378CONFIG_VXLAN=m 377CONFIG_VXLAN=m
378CONFIG_GENEVE=m
379CONFIG_NETCONSOLE=m 379CONFIG_NETCONSOLE=m
380CONFIG_NETCONSOLE_DYNAMIC=y 380CONFIG_NETCONSOLE_DYNAMIC=y
381CONFIG_VETH=m 381CONFIG_VETH=m
@@ -391,6 +391,7 @@ CONFIG_MACMACE=y
391# CONFIG_NET_CADENCE is not set 391# CONFIG_NET_CADENCE is not set
392# CONFIG_NET_VENDOR_BROADCOM is not set 392# CONFIG_NET_VENDOR_BROADCOM is not set
393CONFIG_MAC89x0=y 393CONFIG_MAC89x0=y
394# CONFIG_NET_VENDOR_EZCHIP is not set
394# CONFIG_NET_VENDOR_HP is not set 395# CONFIG_NET_VENDOR_HP is not set
395CONFIG_BVME6000_NET=y 396CONFIG_BVME6000_NET=y
396CONFIG_MVME16x_NET=y 397CONFIG_MVME16x_NET=y
@@ -403,6 +404,7 @@ CONFIG_NE2000=y
403CONFIG_APNE=y 404CONFIG_APNE=y
404CONFIG_ZORRO8390=y 405CONFIG_ZORRO8390=y
405# CONFIG_NET_VENDOR_QUALCOMM is not set 406# CONFIG_NET_VENDOR_QUALCOMM is not set
407# CONFIG_NET_VENDOR_RENESAS is not set
406# CONFIG_NET_VENDOR_ROCKER is not set 408# CONFIG_NET_VENDOR_ROCKER is not set
407# CONFIG_NET_VENDOR_SAMSUNG is not set 409# CONFIG_NET_VENDOR_SAMSUNG is not set
408# CONFIG_NET_VENDOR_SEEQ is not set 410# CONFIG_NET_VENDOR_SEEQ is not set
@@ -510,6 +512,7 @@ CONFIG_UDF_FS=m
510CONFIG_MSDOS_FS=m 512CONFIG_MSDOS_FS=m
511CONFIG_VFAT_FS=m 513CONFIG_VFAT_FS=m
512CONFIG_PROC_KCORE=y 514CONFIG_PROC_KCORE=y
515CONFIG_PROC_CHILDREN=y
513CONFIG_TMPFS=y 516CONFIG_TMPFS=y
514CONFIG_AFFS_FS=m 517CONFIG_AFFS_FS=m
515CONFIG_ECRYPT_FS=m 518CONFIG_ECRYPT_FS=m
@@ -598,6 +601,7 @@ CONFIG_TEST_FIRMWARE=m
598CONFIG_TEST_UDELAY=m 601CONFIG_TEST_UDELAY=m
599CONFIG_EARLY_PRINTK=y 602CONFIG_EARLY_PRINTK=y
600CONFIG_ENCRYPTED_KEYS=m 603CONFIG_ENCRYPTED_KEYS=m
604CONFIG_CRYPTO_RSA=m
601CONFIG_CRYPTO_MANAGER=y 605CONFIG_CRYPTO_MANAGER=y
602CONFIG_CRYPTO_USER=m 606CONFIG_CRYPTO_USER=m
603CONFIG_CRYPTO_CRYPTD=m 607CONFIG_CRYPTO_CRYPTD=m
@@ -605,6 +609,7 @@ CONFIG_CRYPTO_MCRYPTD=m
605CONFIG_CRYPTO_TEST=m 609CONFIG_CRYPTO_TEST=m
606CONFIG_CRYPTO_CCM=m 610CONFIG_CRYPTO_CCM=m
607CONFIG_CRYPTO_GCM=m 611CONFIG_CRYPTO_GCM=m
612CONFIG_CRYPTO_CHACHA20POLY1305=m
608CONFIG_CRYPTO_CTS=m 613CONFIG_CRYPTO_CTS=m
609CONFIG_CRYPTO_LRW=m 614CONFIG_CRYPTO_LRW=m
610CONFIG_CRYPTO_PCBC=m 615CONFIG_CRYPTO_PCBC=m
@@ -633,14 +638,15 @@ CONFIG_CRYPTO_TEA=m
633CONFIG_CRYPTO_TWOFISH=m 638CONFIG_CRYPTO_TWOFISH=m
634CONFIG_CRYPTO_ZLIB=m 639CONFIG_CRYPTO_ZLIB=m
635CONFIG_CRYPTO_LZO=m 640CONFIG_CRYPTO_LZO=m
641CONFIG_CRYPTO_842=m
636CONFIG_CRYPTO_LZ4=m 642CONFIG_CRYPTO_LZ4=m
637CONFIG_CRYPTO_LZ4HC=m 643CONFIG_CRYPTO_LZ4HC=m
638# CONFIG_CRYPTO_ANSI_CPRNG is not set 644CONFIG_CRYPTO_ANSI_CPRNG=m
639CONFIG_CRYPTO_DRBG_MENU=m
640CONFIG_CRYPTO_DRBG_HASH=y 645CONFIG_CRYPTO_DRBG_HASH=y
641CONFIG_CRYPTO_DRBG_CTR=y 646CONFIG_CRYPTO_DRBG_CTR=y
642CONFIG_CRYPTO_USER_API_HASH=m 647CONFIG_CRYPTO_USER_API_HASH=m
643CONFIG_CRYPTO_USER_API_SKCIPHER=m 648CONFIG_CRYPTO_USER_API_SKCIPHER=m
644CONFIG_CRYPTO_USER_API_RNG=m 649CONFIG_CRYPTO_USER_API_RNG=m
650CONFIG_CRYPTO_USER_API_AEAD=m
645# CONFIG_CRYPTO_HW is not set 651# CONFIG_CRYPTO_HW is not set
646CONFIG_XZ_DEC_TEST=m 652CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index f34491ec0126..ef00875994d9 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -52,7 +52,7 @@ CONFIG_NET_IPGRE_DEMUX=m
52CONFIG_NET_IPGRE=m 52CONFIG_NET_IPGRE=m
53CONFIG_NET_IPVTI=m 53CONFIG_NET_IPVTI=m
54CONFIG_NET_FOU_IP_TUNNELS=y 54CONFIG_NET_FOU_IP_TUNNELS=y
55CONFIG_GENEVE=m 55CONFIG_GENEVE_CORE=m
56CONFIG_INET_AH=m 56CONFIG_INET_AH=m
57CONFIG_INET_ESP=m 57CONFIG_INET_ESP=m
58CONFIG_INET_IPCOMP=m 58CONFIG_INET_IPCOMP=m
@@ -86,6 +86,7 @@ CONFIG_NF_CONNTRACK_SIP=m
86CONFIG_NF_CONNTRACK_TFTP=m 86CONFIG_NF_CONNTRACK_TFTP=m
87CONFIG_NF_TABLES=m 87CONFIG_NF_TABLES=m
88CONFIG_NF_TABLES_INET=m 88CONFIG_NF_TABLES_INET=m
89CONFIG_NF_TABLES_NETDEV=m
89CONFIG_NFT_EXTHDR=m 90CONFIG_NFT_EXTHDR=m
90CONFIG_NFT_META=m 91CONFIG_NFT_META=m
91CONFIG_NFT_CT=m 92CONFIG_NFT_CT=m
@@ -276,7 +277,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
276CONFIG_BLK_DEV_DRBD=m 277CONFIG_BLK_DEV_DRBD=m
277CONFIG_BLK_DEV_NBD=m 278CONFIG_BLK_DEV_NBD=m
278CONFIG_BLK_DEV_RAM=y 279CONFIG_BLK_DEV_RAM=y
279CONFIG_BLK_DEV_PMEM=m
280CONFIG_CDROM_PKTCDVD=m 280CONFIG_CDROM_PKTCDVD=m
281CONFIG_ATA_OVER_ETH=m 281CONFIG_ATA_OVER_ETH=m
282CONFIG_DUMMY_IRQ=m 282CONFIG_DUMMY_IRQ=m
@@ -300,7 +300,6 @@ CONFIG_BLK_DEV_DM=m
300CONFIG_DM_CRYPT=m 300CONFIG_DM_CRYPT=m
301CONFIG_DM_SNAPSHOT=m 301CONFIG_DM_SNAPSHOT=m
302CONFIG_DM_THIN_PROVISIONING=m 302CONFIG_DM_THIN_PROVISIONING=m
303CONFIG_DM_CACHE=m
304CONFIG_DM_ERA=m 303CONFIG_DM_ERA=m
305CONFIG_DM_MIRROR=m 304CONFIG_DM_MIRROR=m
306CONFIG_DM_RAID=m 305CONFIG_DM_RAID=m
@@ -325,6 +324,7 @@ CONFIG_MACVLAN=m
325CONFIG_MACVTAP=m 324CONFIG_MACVTAP=m
326CONFIG_IPVLAN=m 325CONFIG_IPVLAN=m
327CONFIG_VXLAN=m 326CONFIG_VXLAN=m
327CONFIG_GENEVE=m
328CONFIG_NETCONSOLE=m 328CONFIG_NETCONSOLE=m
329CONFIG_NETCONSOLE_DYNAMIC=y 329CONFIG_NETCONSOLE_DYNAMIC=y
330CONFIG_VETH=m 330CONFIG_VETH=m
@@ -332,11 +332,13 @@ CONFIG_MVME147_NET=y
332# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set 333# CONFIG_NET_CADENCE is not set
334# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
335# CONFIG_NET_VENDOR_EZCHIP is not set
335# CONFIG_NET_VENDOR_INTEL is not set 336# CONFIG_NET_VENDOR_INTEL is not set
336# CONFIG_NET_VENDOR_MARVELL is not set 337# CONFIG_NET_VENDOR_MARVELL is not set
337# CONFIG_NET_VENDOR_MICREL is not set 338# CONFIG_NET_VENDOR_MICREL is not set
338# CONFIG_NET_VENDOR_NATSEMI is not set 339# CONFIG_NET_VENDOR_NATSEMI is not set
339# CONFIG_NET_VENDOR_QUALCOMM is not set 340# CONFIG_NET_VENDOR_QUALCOMM is not set
341# CONFIG_NET_VENDOR_RENESAS is not set
340# CONFIG_NET_VENDOR_ROCKER is not set 342# CONFIG_NET_VENDOR_ROCKER is not set
341# CONFIG_NET_VENDOR_SAMSUNG is not set 343# CONFIG_NET_VENDOR_SAMSUNG is not set
342# CONFIG_NET_VENDOR_SEEQ is not set 344# CONFIG_NET_VENDOR_SEEQ is not set
@@ -399,6 +401,7 @@ CONFIG_UDF_FS=m
399CONFIG_MSDOS_FS=m 401CONFIG_MSDOS_FS=m
400CONFIG_VFAT_FS=m 402CONFIG_VFAT_FS=m
401CONFIG_PROC_KCORE=y 403CONFIG_PROC_KCORE=y
404CONFIG_PROC_CHILDREN=y
402CONFIG_TMPFS=y 405CONFIG_TMPFS=y
403CONFIG_AFFS_FS=m 406CONFIG_AFFS_FS=m
404CONFIG_ECRYPT_FS=m 407CONFIG_ECRYPT_FS=m
@@ -487,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
487CONFIG_TEST_UDELAY=m 490CONFIG_TEST_UDELAY=m
488CONFIG_EARLY_PRINTK=y 491CONFIG_EARLY_PRINTK=y
489CONFIG_ENCRYPTED_KEYS=m 492CONFIG_ENCRYPTED_KEYS=m
493CONFIG_CRYPTO_RSA=m
490CONFIG_CRYPTO_MANAGER=y 494CONFIG_CRYPTO_MANAGER=y
491CONFIG_CRYPTO_USER=m 495CONFIG_CRYPTO_USER=m
492CONFIG_CRYPTO_CRYPTD=m 496CONFIG_CRYPTO_CRYPTD=m
@@ -494,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
494CONFIG_CRYPTO_TEST=m 498CONFIG_CRYPTO_TEST=m
495CONFIG_CRYPTO_CCM=m 499CONFIG_CRYPTO_CCM=m
496CONFIG_CRYPTO_GCM=m 500CONFIG_CRYPTO_GCM=m
501CONFIG_CRYPTO_CHACHA20POLY1305=m
497CONFIG_CRYPTO_CTS=m 502CONFIG_CRYPTO_CTS=m
498CONFIG_CRYPTO_LRW=m 503CONFIG_CRYPTO_LRW=m
499CONFIG_CRYPTO_PCBC=m 504CONFIG_CRYPTO_PCBC=m
@@ -522,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
522CONFIG_CRYPTO_TWOFISH=m 527CONFIG_CRYPTO_TWOFISH=m
523CONFIG_CRYPTO_ZLIB=m 528CONFIG_CRYPTO_ZLIB=m
524CONFIG_CRYPTO_LZO=m 529CONFIG_CRYPTO_LZO=m
530CONFIG_CRYPTO_842=m
525CONFIG_CRYPTO_LZ4=m 531CONFIG_CRYPTO_LZ4=m
526CONFIG_CRYPTO_LZ4HC=m 532CONFIG_CRYPTO_LZ4HC=m
527# CONFIG_CRYPTO_ANSI_CPRNG is not set 533CONFIG_CRYPTO_ANSI_CPRNG=m
528CONFIG_CRYPTO_DRBG_MENU=m
529CONFIG_CRYPTO_DRBG_HASH=y 534CONFIG_CRYPTO_DRBG_HASH=y
530CONFIG_CRYPTO_DRBG_CTR=y 535CONFIG_CRYPTO_DRBG_CTR=y
531CONFIG_CRYPTO_USER_API_HASH=m 536CONFIG_CRYPTO_USER_API_HASH=m
532CONFIG_CRYPTO_USER_API_SKCIPHER=m 537CONFIG_CRYPTO_USER_API_SKCIPHER=m
533CONFIG_CRYPTO_USER_API_RNG=m 538CONFIG_CRYPTO_USER_API_RNG=m
539CONFIG_CRYPTO_USER_API_AEAD=m
534# CONFIG_CRYPTO_HW is not set 540# CONFIG_CRYPTO_HW is not set
535CONFIG_XZ_DEC_TEST=m 541CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 3d3614d1b041..387c2bd90ff1 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
53CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
54CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y 55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m 56CONFIG_GENEVE_CORE=m
57CONFIG_INET_AH=m 57CONFIG_INET_AH=m
58CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
59CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
87CONFIG_NF_CONNTRACK_TFTP=m 87CONFIG_NF_CONNTRACK_TFTP=m
88CONFIG_NF_TABLES=m 88CONFIG_NF_TABLES=m
89CONFIG_NF_TABLES_INET=m 89CONFIG_NF_TABLES_INET=m
90CONFIG_NF_TABLES_NETDEV=m
90CONFIG_NFT_EXTHDR=m 91CONFIG_NFT_EXTHDR=m
91CONFIG_NFT_META=m 92CONFIG_NFT_META=m
92CONFIG_NFT_CT=m 93CONFIG_NFT_CT=m
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277CONFIG_BLK_DEV_DRBD=m 278CONFIG_BLK_DEV_DRBD=m
278CONFIG_BLK_DEV_NBD=m 279CONFIG_BLK_DEV_NBD=m
279CONFIG_BLK_DEV_RAM=y 280CONFIG_BLK_DEV_RAM=y
280CONFIG_BLK_DEV_PMEM=m
281CONFIG_CDROM_PKTCDVD=m 281CONFIG_CDROM_PKTCDVD=m
282CONFIG_ATA_OVER_ETH=m 282CONFIG_ATA_OVER_ETH=m
283CONFIG_DUMMY_IRQ=m 283CONFIG_DUMMY_IRQ=m
@@ -301,7 +301,6 @@ CONFIG_BLK_DEV_DM=m
301CONFIG_DM_CRYPT=m 301CONFIG_DM_CRYPT=m
302CONFIG_DM_SNAPSHOT=m 302CONFIG_DM_SNAPSHOT=m
303CONFIG_DM_THIN_PROVISIONING=m 303CONFIG_DM_THIN_PROVISIONING=m
304CONFIG_DM_CACHE=m
305CONFIG_DM_ERA=m 304CONFIG_DM_ERA=m
306CONFIG_DM_MIRROR=m 305CONFIG_DM_MIRROR=m
307CONFIG_DM_RAID=m 306CONFIG_DM_RAID=m
@@ -326,17 +325,20 @@ CONFIG_MACVLAN=m
326CONFIG_MACVTAP=m 325CONFIG_MACVTAP=m
327CONFIG_IPVLAN=m 326CONFIG_IPVLAN=m
328CONFIG_VXLAN=m 327CONFIG_VXLAN=m
328CONFIG_GENEVE=m
329CONFIG_NETCONSOLE=m 329CONFIG_NETCONSOLE=m
330CONFIG_NETCONSOLE_DYNAMIC=y 330CONFIG_NETCONSOLE_DYNAMIC=y
331CONFIG_VETH=m 331CONFIG_VETH=m
332# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set 333# CONFIG_NET_CADENCE is not set
334# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
335# CONFIG_NET_VENDOR_EZCHIP is not set
335CONFIG_MVME16x_NET=y 336CONFIG_MVME16x_NET=y
336# CONFIG_NET_VENDOR_MARVELL is not set 337# CONFIG_NET_VENDOR_MARVELL is not set
337# CONFIG_NET_VENDOR_MICREL is not set 338# CONFIG_NET_VENDOR_MICREL is not set
338# CONFIG_NET_VENDOR_NATSEMI is not set 339# CONFIG_NET_VENDOR_NATSEMI is not set
339# CONFIG_NET_VENDOR_QUALCOMM is not set 340# CONFIG_NET_VENDOR_QUALCOMM is not set
341# CONFIG_NET_VENDOR_RENESAS is not set
340# CONFIG_NET_VENDOR_ROCKER is not set 342# CONFIG_NET_VENDOR_ROCKER is not set
341# CONFIG_NET_VENDOR_SAMSUNG is not set 343# CONFIG_NET_VENDOR_SAMSUNG is not set
342# CONFIG_NET_VENDOR_SEEQ is not set 344# CONFIG_NET_VENDOR_SEEQ is not set
@@ -399,6 +401,7 @@ CONFIG_UDF_FS=m
399CONFIG_MSDOS_FS=m 401CONFIG_MSDOS_FS=m
400CONFIG_VFAT_FS=m 402CONFIG_VFAT_FS=m
401CONFIG_PROC_KCORE=y 403CONFIG_PROC_KCORE=y
404CONFIG_PROC_CHILDREN=y
402CONFIG_TMPFS=y 405CONFIG_TMPFS=y
403CONFIG_AFFS_FS=m 406CONFIG_AFFS_FS=m
404CONFIG_ECRYPT_FS=m 407CONFIG_ECRYPT_FS=m
@@ -487,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m
487CONFIG_TEST_UDELAY=m 490CONFIG_TEST_UDELAY=m
488CONFIG_EARLY_PRINTK=y 491CONFIG_EARLY_PRINTK=y
489CONFIG_ENCRYPTED_KEYS=m 492CONFIG_ENCRYPTED_KEYS=m
493CONFIG_CRYPTO_RSA=m
490CONFIG_CRYPTO_MANAGER=y 494CONFIG_CRYPTO_MANAGER=y
491CONFIG_CRYPTO_USER=m 495CONFIG_CRYPTO_USER=m
492CONFIG_CRYPTO_CRYPTD=m 496CONFIG_CRYPTO_CRYPTD=m
@@ -494,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
494CONFIG_CRYPTO_TEST=m 498CONFIG_CRYPTO_TEST=m
495CONFIG_CRYPTO_CCM=m 499CONFIG_CRYPTO_CCM=m
496CONFIG_CRYPTO_GCM=m 500CONFIG_CRYPTO_GCM=m
501CONFIG_CRYPTO_CHACHA20POLY1305=m
497CONFIG_CRYPTO_CTS=m 502CONFIG_CRYPTO_CTS=m
498CONFIG_CRYPTO_LRW=m 503CONFIG_CRYPTO_LRW=m
499CONFIG_CRYPTO_PCBC=m 504CONFIG_CRYPTO_PCBC=m
@@ -522,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
522CONFIG_CRYPTO_TWOFISH=m 527CONFIG_CRYPTO_TWOFISH=m
523CONFIG_CRYPTO_ZLIB=m 528CONFIG_CRYPTO_ZLIB=m
524CONFIG_CRYPTO_LZO=m 529CONFIG_CRYPTO_LZO=m
530CONFIG_CRYPTO_842=m
525CONFIG_CRYPTO_LZ4=m 531CONFIG_CRYPTO_LZ4=m
526CONFIG_CRYPTO_LZ4HC=m 532CONFIG_CRYPTO_LZ4HC=m
527# CONFIG_CRYPTO_ANSI_CPRNG is not set 533CONFIG_CRYPTO_ANSI_CPRNG=m
528CONFIG_CRYPTO_DRBG_MENU=m
529CONFIG_CRYPTO_DRBG_HASH=y 534CONFIG_CRYPTO_DRBG_HASH=y
530CONFIG_CRYPTO_DRBG_CTR=y 535CONFIG_CRYPTO_DRBG_CTR=y
531CONFIG_CRYPTO_USER_API_HASH=m 536CONFIG_CRYPTO_USER_API_HASH=m
532CONFIG_CRYPTO_USER_API_SKCIPHER=m 537CONFIG_CRYPTO_USER_API_SKCIPHER=m
533CONFIG_CRYPTO_USER_API_RNG=m 538CONFIG_CRYPTO_USER_API_RNG=m
539CONFIG_CRYPTO_USER_API_AEAD=m
534# CONFIG_CRYPTO_HW is not set 540# CONFIG_CRYPTO_HW is not set
535CONFIG_XZ_DEC_TEST=m 541CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 643e9c93bea7..35355c1bc714 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m
53CONFIG_NET_IPGRE=m 53CONFIG_NET_IPGRE=m
54CONFIG_NET_IPVTI=m 54CONFIG_NET_IPVTI=m
55CONFIG_NET_FOU_IP_TUNNELS=y 55CONFIG_NET_FOU_IP_TUNNELS=y
56CONFIG_GENEVE=m 56CONFIG_GENEVE_CORE=m
57CONFIG_INET_AH=m 57CONFIG_INET_AH=m
58CONFIG_INET_ESP=m 58CONFIG_INET_ESP=m
59CONFIG_INET_IPCOMP=m 59CONFIG_INET_IPCOMP=m
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m
87CONFIG_NF_CONNTRACK_TFTP=m 87CONFIG_NF_CONNTRACK_TFTP=m
88CONFIG_NF_TABLES=m 88CONFIG_NF_TABLES=m
89CONFIG_NF_TABLES_INET=m 89CONFIG_NF_TABLES_INET=m
90CONFIG_NF_TABLES_NETDEV=m
90CONFIG_NFT_EXTHDR=m 91CONFIG_NFT_EXTHDR=m
91CONFIG_NFT_META=m 92CONFIG_NFT_META=m
92CONFIG_NFT_CT=m 93CONFIG_NFT_CT=m
@@ -280,7 +281,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
280CONFIG_BLK_DEV_DRBD=m 281CONFIG_BLK_DEV_DRBD=m
281CONFIG_BLK_DEV_NBD=m 282CONFIG_BLK_DEV_NBD=m
282CONFIG_BLK_DEV_RAM=y 283CONFIG_BLK_DEV_RAM=y
283CONFIG_BLK_DEV_PMEM=m
284CONFIG_CDROM_PKTCDVD=m 284CONFIG_CDROM_PKTCDVD=m
285CONFIG_ATA_OVER_ETH=m 285CONFIG_ATA_OVER_ETH=m
286CONFIG_DUMMY_IRQ=m 286CONFIG_DUMMY_IRQ=m
@@ -307,7 +307,6 @@ CONFIG_BLK_DEV_DM=m
307CONFIG_DM_CRYPT=m 307CONFIG_DM_CRYPT=m
308CONFIG_DM_SNAPSHOT=m 308CONFIG_DM_SNAPSHOT=m
309CONFIG_DM_THIN_PROVISIONING=m 309CONFIG_DM_THIN_PROVISIONING=m
310CONFIG_DM_CACHE=m
311CONFIG_DM_ERA=m 310CONFIG_DM_ERA=m
312CONFIG_DM_MIRROR=m 311CONFIG_DM_MIRROR=m
313CONFIG_DM_RAID=m 312CONFIG_DM_RAID=m
@@ -332,6 +331,7 @@ CONFIG_MACVLAN=m
332CONFIG_MACVTAP=m 331CONFIG_MACVTAP=m
333CONFIG_IPVLAN=m 332CONFIG_IPVLAN=m
334CONFIG_VXLAN=m 333CONFIG_VXLAN=m
334CONFIG_GENEVE=m
335CONFIG_NETCONSOLE=m 335CONFIG_NETCONSOLE=m
336CONFIG_NETCONSOLE_DYNAMIC=y 336CONFIG_NETCONSOLE_DYNAMIC=y
337CONFIG_VETH=m 337CONFIG_VETH=m
@@ -341,12 +341,14 @@ CONFIG_VETH=m
341# CONFIG_NET_CADENCE is not set 341# CONFIG_NET_CADENCE is not set
342# CONFIG_NET_VENDOR_BROADCOM is not set 342# CONFIG_NET_VENDOR_BROADCOM is not set
343# CONFIG_NET_VENDOR_CIRRUS is not set 343# CONFIG_NET_VENDOR_CIRRUS is not set
344# CONFIG_NET_VENDOR_EZCHIP is not set
344# CONFIG_NET_VENDOR_HP is not set 345# CONFIG_NET_VENDOR_HP is not set
345# CONFIG_NET_VENDOR_INTEL is not set 346# CONFIG_NET_VENDOR_INTEL is not set
346# CONFIG_NET_VENDOR_MARVELL is not set 347# CONFIG_NET_VENDOR_MARVELL is not set
347# CONFIG_NET_VENDOR_MICREL is not set 348# CONFIG_NET_VENDOR_MICREL is not set
348CONFIG_NE2000=y 349CONFIG_NE2000=y
349# CONFIG_NET_VENDOR_QUALCOMM is not set 350# CONFIG_NET_VENDOR_QUALCOMM is not set
351# CONFIG_NET_VENDOR_RENESAS is not set
350# CONFIG_NET_VENDOR_ROCKER is not set 352# CONFIG_NET_VENDOR_ROCKER is not set
351# CONFIG_NET_VENDOR_SAMSUNG is not set 353# CONFIG_NET_VENDOR_SAMSUNG is not set
352# CONFIG_NET_VENDOR_SEEQ is not set 354# CONFIG_NET_VENDOR_SEEQ is not set
@@ -421,6 +423,7 @@ CONFIG_UDF_FS=m
421CONFIG_MSDOS_FS=m 423CONFIG_MSDOS_FS=m
422CONFIG_VFAT_FS=m 424CONFIG_VFAT_FS=m
423CONFIG_PROC_KCORE=y 425CONFIG_PROC_KCORE=y
426CONFIG_PROC_CHILDREN=y
424CONFIG_TMPFS=y 427CONFIG_TMPFS=y
425CONFIG_AFFS_FS=m 428CONFIG_AFFS_FS=m
426CONFIG_ECRYPT_FS=m 429CONFIG_ECRYPT_FS=m
@@ -509,6 +512,7 @@ CONFIG_TEST_FIRMWARE=m
509CONFIG_TEST_UDELAY=m 512CONFIG_TEST_UDELAY=m
510CONFIG_EARLY_PRINTK=y 513CONFIG_EARLY_PRINTK=y
511CONFIG_ENCRYPTED_KEYS=m 514CONFIG_ENCRYPTED_KEYS=m
515CONFIG_CRYPTO_RSA=m
512CONFIG_CRYPTO_MANAGER=y 516CONFIG_CRYPTO_MANAGER=y
513CONFIG_CRYPTO_USER=m 517CONFIG_CRYPTO_USER=m
514CONFIG_CRYPTO_CRYPTD=m 518CONFIG_CRYPTO_CRYPTD=m
@@ -516,6 +520,7 @@ CONFIG_CRYPTO_MCRYPTD=m
516CONFIG_CRYPTO_TEST=m 520CONFIG_CRYPTO_TEST=m
517CONFIG_CRYPTO_CCM=m 521CONFIG_CRYPTO_CCM=m
518CONFIG_CRYPTO_GCM=m 522CONFIG_CRYPTO_GCM=m
523CONFIG_CRYPTO_CHACHA20POLY1305=m
519CONFIG_CRYPTO_CTS=m 524CONFIG_CRYPTO_CTS=m
520CONFIG_CRYPTO_LRW=m 525CONFIG_CRYPTO_LRW=m
521CONFIG_CRYPTO_PCBC=m 526CONFIG_CRYPTO_PCBC=m
@@ -544,14 +549,15 @@ CONFIG_CRYPTO_TEA=m
544CONFIG_CRYPTO_TWOFISH=m 549CONFIG_CRYPTO_TWOFISH=m
545CONFIG_CRYPTO_ZLIB=m 550CONFIG_CRYPTO_ZLIB=m
546CONFIG_CRYPTO_LZO=m 551CONFIG_CRYPTO_LZO=m
552CONFIG_CRYPTO_842=m
547CONFIG_CRYPTO_LZ4=m 553CONFIG_CRYPTO_LZ4=m
548CONFIG_CRYPTO_LZ4HC=m 554CONFIG_CRYPTO_LZ4HC=m
549# CONFIG_CRYPTO_ANSI_CPRNG is not set 555CONFIG_CRYPTO_ANSI_CPRNG=m
550CONFIG_CRYPTO_DRBG_MENU=m
551CONFIG_CRYPTO_DRBG_HASH=y 556CONFIG_CRYPTO_DRBG_HASH=y
552CONFIG_CRYPTO_DRBG_CTR=y 557CONFIG_CRYPTO_DRBG_CTR=y
553CONFIG_CRYPTO_USER_API_HASH=m 558CONFIG_CRYPTO_USER_API_HASH=m
554CONFIG_CRYPTO_USER_API_SKCIPHER=m 559CONFIG_CRYPTO_USER_API_SKCIPHER=m
555CONFIG_CRYPTO_USER_API_RNG=m 560CONFIG_CRYPTO_USER_API_RNG=m
561CONFIG_CRYPTO_USER_API_AEAD=m
556# CONFIG_CRYPTO_HW is not set 562# CONFIG_CRYPTO_HW is not set
557CONFIG_XZ_DEC_TEST=m 563CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 8fecc5aa166c..8442d267b877 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m
50CONFIG_NET_IPGRE=m 50CONFIG_NET_IPGRE=m
51CONFIG_NET_IPVTI=m 51CONFIG_NET_IPVTI=m
52CONFIG_NET_FOU_IP_TUNNELS=y 52CONFIG_NET_FOU_IP_TUNNELS=y
53CONFIG_GENEVE=m 53CONFIG_GENEVE_CORE=m
54CONFIG_INET_AH=m 54CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 55CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 56CONFIG_INET_IPCOMP=m
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m
84CONFIG_NF_CONNTRACK_TFTP=m 84CONFIG_NF_CONNTRACK_TFTP=m
85CONFIG_NF_TABLES=m 85CONFIG_NF_TABLES=m
86CONFIG_NF_TABLES_INET=m 86CONFIG_NF_TABLES_INET=m
87CONFIG_NF_TABLES_NETDEV=m
87CONFIG_NFT_EXTHDR=m 88CONFIG_NFT_EXTHDR=m
88CONFIG_NFT_META=m 89CONFIG_NFT_META=m
89CONFIG_NFT_CT=m 90CONFIG_NFT_CT=m
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
274CONFIG_BLK_DEV_DRBD=m 275CONFIG_BLK_DEV_DRBD=m
275CONFIG_BLK_DEV_NBD=m 276CONFIG_BLK_DEV_NBD=m
276CONFIG_BLK_DEV_RAM=y 277CONFIG_BLK_DEV_RAM=y
277CONFIG_BLK_DEV_PMEM=m
278CONFIG_CDROM_PKTCDVD=m 278CONFIG_CDROM_PKTCDVD=m
279CONFIG_ATA_OVER_ETH=m 279CONFIG_ATA_OVER_ETH=m
280CONFIG_DUMMY_IRQ=m 280CONFIG_DUMMY_IRQ=m
@@ -298,7 +298,6 @@ CONFIG_BLK_DEV_DM=m
298CONFIG_DM_CRYPT=m 298CONFIG_DM_CRYPT=m
299CONFIG_DM_SNAPSHOT=m 299CONFIG_DM_SNAPSHOT=m
300CONFIG_DM_THIN_PROVISIONING=m 300CONFIG_DM_THIN_PROVISIONING=m
301CONFIG_DM_CACHE=m
302CONFIG_DM_ERA=m 301CONFIG_DM_ERA=m
303CONFIG_DM_MIRROR=m 302CONFIG_DM_MIRROR=m
304CONFIG_DM_RAID=m 303CONFIG_DM_RAID=m
@@ -323,17 +322,20 @@ CONFIG_MACVLAN=m
323CONFIG_MACVTAP=m 322CONFIG_MACVTAP=m
324CONFIG_IPVLAN=m 323CONFIG_IPVLAN=m
325CONFIG_VXLAN=m 324CONFIG_VXLAN=m
325CONFIG_GENEVE=m
326CONFIG_NETCONSOLE=m 326CONFIG_NETCONSOLE=m
327CONFIG_NETCONSOLE_DYNAMIC=y 327CONFIG_NETCONSOLE_DYNAMIC=y
328CONFIG_VETH=m 328CONFIG_VETH=m
329CONFIG_SUN3LANCE=y 329CONFIG_SUN3LANCE=y
330# CONFIG_NET_VENDOR_ARC is not set 330# CONFIG_NET_VENDOR_ARC is not set
331# CONFIG_NET_CADENCE is not set 331# CONFIG_NET_CADENCE is not set
332# CONFIG_NET_VENDOR_EZCHIP is not set
332CONFIG_SUN3_82586=y 333CONFIG_SUN3_82586=y
333# CONFIG_NET_VENDOR_MARVELL is not set 334# CONFIG_NET_VENDOR_MARVELL is not set
334# CONFIG_NET_VENDOR_MICREL is not set 335# CONFIG_NET_VENDOR_MICREL is not set
335# CONFIG_NET_VENDOR_NATSEMI is not set 336# CONFIG_NET_VENDOR_NATSEMI is not set
336# CONFIG_NET_VENDOR_QUALCOMM is not set 337# CONFIG_NET_VENDOR_QUALCOMM is not set
338# CONFIG_NET_VENDOR_RENESAS is not set
337# CONFIG_NET_VENDOR_ROCKER is not set 339# CONFIG_NET_VENDOR_ROCKER is not set
338# CONFIG_NET_VENDOR_SAMSUNG is not set 340# CONFIG_NET_VENDOR_SAMSUNG is not set
339# CONFIG_NET_VENDOR_SEEQ is not set 341# CONFIG_NET_VENDOR_SEEQ is not set
@@ -400,6 +402,7 @@ CONFIG_UDF_FS=m
400CONFIG_MSDOS_FS=m 402CONFIG_MSDOS_FS=m
401CONFIG_VFAT_FS=m 403CONFIG_VFAT_FS=m
402CONFIG_PROC_KCORE=y 404CONFIG_PROC_KCORE=y
405CONFIG_PROC_CHILDREN=y
403CONFIG_TMPFS=y 406CONFIG_TMPFS=y
404CONFIG_AFFS_FS=m 407CONFIG_AFFS_FS=m
405CONFIG_ECRYPT_FS=m 408CONFIG_ECRYPT_FS=m
@@ -487,6 +490,7 @@ CONFIG_TEST_BPF=m
487CONFIG_TEST_FIRMWARE=m 490CONFIG_TEST_FIRMWARE=m
488CONFIG_TEST_UDELAY=m 491CONFIG_TEST_UDELAY=m
489CONFIG_ENCRYPTED_KEYS=m 492CONFIG_ENCRYPTED_KEYS=m
493CONFIG_CRYPTO_RSA=m
490CONFIG_CRYPTO_MANAGER=y 494CONFIG_CRYPTO_MANAGER=y
491CONFIG_CRYPTO_USER=m 495CONFIG_CRYPTO_USER=m
492CONFIG_CRYPTO_CRYPTD=m 496CONFIG_CRYPTO_CRYPTD=m
@@ -494,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m
494CONFIG_CRYPTO_TEST=m 498CONFIG_CRYPTO_TEST=m
495CONFIG_CRYPTO_CCM=m 499CONFIG_CRYPTO_CCM=m
496CONFIG_CRYPTO_GCM=m 500CONFIG_CRYPTO_GCM=m
501CONFIG_CRYPTO_CHACHA20POLY1305=m
497CONFIG_CRYPTO_CTS=m 502CONFIG_CRYPTO_CTS=m
498CONFIG_CRYPTO_LRW=m 503CONFIG_CRYPTO_LRW=m
499CONFIG_CRYPTO_PCBC=m 504CONFIG_CRYPTO_PCBC=m
@@ -522,14 +527,15 @@ CONFIG_CRYPTO_TEA=m
522CONFIG_CRYPTO_TWOFISH=m 527CONFIG_CRYPTO_TWOFISH=m
523CONFIG_CRYPTO_ZLIB=m 528CONFIG_CRYPTO_ZLIB=m
524CONFIG_CRYPTO_LZO=m 529CONFIG_CRYPTO_LZO=m
530CONFIG_CRYPTO_842=m
525CONFIG_CRYPTO_LZ4=m 531CONFIG_CRYPTO_LZ4=m
526CONFIG_CRYPTO_LZ4HC=m 532CONFIG_CRYPTO_LZ4HC=m
527# CONFIG_CRYPTO_ANSI_CPRNG is not set 533CONFIG_CRYPTO_ANSI_CPRNG=m
528CONFIG_CRYPTO_DRBG_MENU=m
529CONFIG_CRYPTO_DRBG_HASH=y 534CONFIG_CRYPTO_DRBG_HASH=y
530CONFIG_CRYPTO_DRBG_CTR=y 535CONFIG_CRYPTO_DRBG_CTR=y
531CONFIG_CRYPTO_USER_API_HASH=m 536CONFIG_CRYPTO_USER_API_HASH=m
532CONFIG_CRYPTO_USER_API_SKCIPHER=m 537CONFIG_CRYPTO_USER_API_SKCIPHER=m
533CONFIG_CRYPTO_USER_API_RNG=m 538CONFIG_CRYPTO_USER_API_RNG=m
539CONFIG_CRYPTO_USER_API_AEAD=m
534# CONFIG_CRYPTO_HW is not set 540# CONFIG_CRYPTO_HW is not set
535CONFIG_XZ_DEC_TEST=m 541CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 9902c5bfbdc8..0e1b542e1555 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m
50CONFIG_NET_IPGRE=m 50CONFIG_NET_IPGRE=m
51CONFIG_NET_IPVTI=m 51CONFIG_NET_IPVTI=m
52CONFIG_NET_FOU_IP_TUNNELS=y 52CONFIG_NET_FOU_IP_TUNNELS=y
53CONFIG_GENEVE=m 53CONFIG_GENEVE_CORE=m
54CONFIG_INET_AH=m 54CONFIG_INET_AH=m
55CONFIG_INET_ESP=m 55CONFIG_INET_ESP=m
56CONFIG_INET_IPCOMP=m 56CONFIG_INET_IPCOMP=m
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m
84CONFIG_NF_CONNTRACK_TFTP=m 84CONFIG_NF_CONNTRACK_TFTP=m
85CONFIG_NF_TABLES=m 85CONFIG_NF_TABLES=m
86CONFIG_NF_TABLES_INET=m 86CONFIG_NF_TABLES_INET=m
87CONFIG_NF_TABLES_NETDEV=m
87CONFIG_NFT_EXTHDR=m 88CONFIG_NFT_EXTHDR=m
88CONFIG_NFT_META=m 89CONFIG_NFT_META=m
89CONFIG_NFT_CT=m 90CONFIG_NFT_CT=m
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
274CONFIG_BLK_DEV_DRBD=m 275CONFIG_BLK_DEV_DRBD=m
275CONFIG_BLK_DEV_NBD=m 276CONFIG_BLK_DEV_NBD=m
276CONFIG_BLK_DEV_RAM=y 277CONFIG_BLK_DEV_RAM=y
277CONFIG_BLK_DEV_PMEM=m
278CONFIG_CDROM_PKTCDVD=m 278CONFIG_CDROM_PKTCDVD=m
279CONFIG_ATA_OVER_ETH=m 279CONFIG_ATA_OVER_ETH=m
280CONFIG_DUMMY_IRQ=m 280CONFIG_DUMMY_IRQ=m
@@ -298,7 +298,6 @@ CONFIG_BLK_DEV_DM=m
298CONFIG_DM_CRYPT=m 298CONFIG_DM_CRYPT=m
299CONFIG_DM_SNAPSHOT=m 299CONFIG_DM_SNAPSHOT=m
300CONFIG_DM_THIN_PROVISIONING=m 300CONFIG_DM_THIN_PROVISIONING=m
301CONFIG_DM_CACHE=m
302CONFIG_DM_ERA=m 301CONFIG_DM_ERA=m
303CONFIG_DM_MIRROR=m 302CONFIG_DM_MIRROR=m
304CONFIG_DM_RAID=m 303CONFIG_DM_RAID=m
@@ -323,6 +322,7 @@ CONFIG_MACVLAN=m
323CONFIG_MACVTAP=m 322CONFIG_MACVTAP=m
324CONFIG_IPVLAN=m 323CONFIG_IPVLAN=m
325CONFIG_VXLAN=m 324CONFIG_VXLAN=m
325CONFIG_GENEVE=m
326CONFIG_NETCONSOLE=m 326CONFIG_NETCONSOLE=m
327CONFIG_NETCONSOLE_DYNAMIC=y 327CONFIG_NETCONSOLE_DYNAMIC=y
328CONFIG_VETH=m 328CONFIG_VETH=m
@@ -330,11 +330,13 @@ CONFIG_SUN3LANCE=y
330# CONFIG_NET_VENDOR_ARC is not set 330# CONFIG_NET_VENDOR_ARC is not set
331# CONFIG_NET_CADENCE is not set 331# CONFIG_NET_CADENCE is not set
332# CONFIG_NET_VENDOR_BROADCOM is not set 332# CONFIG_NET_VENDOR_BROADCOM is not set
333# CONFIG_NET_VENDOR_EZCHIP is not set
333# CONFIG_NET_VENDOR_INTEL is not set 334# CONFIG_NET_VENDOR_INTEL is not set
334# CONFIG_NET_VENDOR_MARVELL is not set 335# CONFIG_NET_VENDOR_MARVELL is not set
335# CONFIG_NET_VENDOR_MICREL is not set 336# CONFIG_NET_VENDOR_MICREL is not set
336# CONFIG_NET_VENDOR_NATSEMI is not set 337# CONFIG_NET_VENDOR_NATSEMI is not set
337# CONFIG_NET_VENDOR_QUALCOMM is not set 338# CONFIG_NET_VENDOR_QUALCOMM is not set
339# CONFIG_NET_VENDOR_RENESAS is not set
338# CONFIG_NET_VENDOR_ROCKER is not set 340# CONFIG_NET_VENDOR_ROCKER is not set
339# CONFIG_NET_VENDOR_SAMSUNG is not set 341# CONFIG_NET_VENDOR_SAMSUNG is not set
340# CONFIG_NET_VENDOR_SEEQ is not set 342# CONFIG_NET_VENDOR_SEEQ is not set
@@ -400,6 +402,7 @@ CONFIG_UDF_FS=m
400CONFIG_MSDOS_FS=m 402CONFIG_MSDOS_FS=m
401CONFIG_VFAT_FS=m 403CONFIG_VFAT_FS=m
402CONFIG_PROC_KCORE=y 404CONFIG_PROC_KCORE=y
405CONFIG_PROC_CHILDREN=y
403CONFIG_TMPFS=y 406CONFIG_TMPFS=y
404CONFIG_AFFS_FS=m 407CONFIG_AFFS_FS=m
405CONFIG_ECRYPT_FS=m 408CONFIG_ECRYPT_FS=m
@@ -488,6 +491,7 @@ CONFIG_TEST_FIRMWARE=m
488CONFIG_TEST_UDELAY=m 491CONFIG_TEST_UDELAY=m
489CONFIG_EARLY_PRINTK=y 492CONFIG_EARLY_PRINTK=y
490CONFIG_ENCRYPTED_KEYS=m 493CONFIG_ENCRYPTED_KEYS=m
494CONFIG_CRYPTO_RSA=m
491CONFIG_CRYPTO_MANAGER=y 495CONFIG_CRYPTO_MANAGER=y
492CONFIG_CRYPTO_USER=m 496CONFIG_CRYPTO_USER=m
493CONFIG_CRYPTO_CRYPTD=m 497CONFIG_CRYPTO_CRYPTD=m
@@ -495,6 +499,7 @@ CONFIG_CRYPTO_MCRYPTD=m
495CONFIG_CRYPTO_TEST=m 499CONFIG_CRYPTO_TEST=m
496CONFIG_CRYPTO_CCM=m 500CONFIG_CRYPTO_CCM=m
497CONFIG_CRYPTO_GCM=m 501CONFIG_CRYPTO_GCM=m
502CONFIG_CRYPTO_CHACHA20POLY1305=m
498CONFIG_CRYPTO_CTS=m 503CONFIG_CRYPTO_CTS=m
499CONFIG_CRYPTO_LRW=m 504CONFIG_CRYPTO_LRW=m
500CONFIG_CRYPTO_PCBC=m 505CONFIG_CRYPTO_PCBC=m
@@ -523,14 +528,15 @@ CONFIG_CRYPTO_TEA=m
523CONFIG_CRYPTO_TWOFISH=m 528CONFIG_CRYPTO_TWOFISH=m
524CONFIG_CRYPTO_ZLIB=m 529CONFIG_CRYPTO_ZLIB=m
525CONFIG_CRYPTO_LZO=m 530CONFIG_CRYPTO_LZO=m
531CONFIG_CRYPTO_842=m
526CONFIG_CRYPTO_LZ4=m 532CONFIG_CRYPTO_LZ4=m
527CONFIG_CRYPTO_LZ4HC=m 533CONFIG_CRYPTO_LZ4HC=m
528# CONFIG_CRYPTO_ANSI_CPRNG is not set 534CONFIG_CRYPTO_ANSI_CPRNG=m
529CONFIG_CRYPTO_DRBG_MENU=m
530CONFIG_CRYPTO_DRBG_HASH=y 535CONFIG_CRYPTO_DRBG_HASH=y
531CONFIG_CRYPTO_DRBG_CTR=y 536CONFIG_CRYPTO_DRBG_CTR=y
532CONFIG_CRYPTO_USER_API_HASH=m 537CONFIG_CRYPTO_USER_API_HASH=m
533CONFIG_CRYPTO_USER_API_SKCIPHER=m 538CONFIG_CRYPTO_USER_API_SKCIPHER=m
534CONFIG_CRYPTO_USER_API_RNG=m 539CONFIG_CRYPTO_USER_API_RNG=m
540CONFIG_CRYPTO_USER_API_AEAD=m
535# CONFIG_CRYPTO_HW is not set 541# CONFIG_CRYPTO_HW is not set
536CONFIG_XZ_DEC_TEST=m 542CONFIG_XZ_DEC_TEST=m
diff --git a/arch/m68k/kernel/bootinfo_proc.c b/arch/m68k/kernel/bootinfo_proc.c
index 7ee853e1432b..2a33a9645ad8 100644
--- a/arch/m68k/kernel/bootinfo_proc.c
+++ b/arch/m68k/kernel/bootinfo_proc.c
@@ -62,12 +62,10 @@ static int __init init_bootinfo_procfs(void)
62 if (!bootinfo_size) 62 if (!bootinfo_size)
63 return -EINVAL; 63 return -EINVAL;
64 64
65 bootinfo_copy = kmalloc(bootinfo_size, GFP_KERNEL); 65 bootinfo_copy = kmemdup(bootinfo_tmp, bootinfo_size, GFP_KERNEL);
66 if (!bootinfo_copy) 66 if (!bootinfo_copy)
67 return -ENOMEM; 67 return -ENOMEM;
68 68
69 memcpy(bootinfo_copy, bootinfo_tmp, bootinfo_size);
70
71 pde = proc_create_data("bootinfo", 0400, NULL, &bootinfo_fops, NULL); 69 pde = proc_create_data("bootinfo", 0400, NULL, &bootinfo_fops, NULL);
72 if (!pde) { 70 if (!pde) {
73 kfree(bootinfo_copy); 71 kfree(bootinfo_copy);
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-24 16:46:26 -0500