diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-07-06 03:43:22 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-08-10 04:26:33 -0400 |
commit | 519f648e15ccded12e7ce4a26c7959c4ac46b145 (patch) | |
tree | a9d4fd50e345a4c0d8e0dcbef226d1322e0b09bb | |
parent | d15135bd94bfb94077484baae0e53e3675541763 (diff) |
m68k/defconfig: Update defconfigs for v4.2-rc1
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 15 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 15 |
12 files changed, 132 insertions, 48 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 446d431fd4ce..0b6b40d37b95 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -57,7 +57,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
57 | CONFIG_NET_IPGRE=m | 57 | CONFIG_NET_IPGRE=m |
58 | CONFIG_NET_IPVTI=m | 58 | CONFIG_NET_IPVTI=m |
59 | CONFIG_NET_FOU_IP_TUNNELS=y | 59 | CONFIG_NET_FOU_IP_TUNNELS=y |
60 | CONFIG_GENEVE=m | 60 | CONFIG_GENEVE_CORE=m |
61 | CONFIG_INET_AH=m | 61 | CONFIG_INET_AH=m |
62 | CONFIG_INET_ESP=m | 62 | CONFIG_INET_ESP=m |
63 | CONFIG_INET_IPCOMP=m | 63 | CONFIG_INET_IPCOMP=m |
@@ -91,6 +91,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
91 | CONFIG_NF_CONNTRACK_TFTP=m | 91 | CONFIG_NF_CONNTRACK_TFTP=m |
92 | CONFIG_NF_TABLES=m | 92 | CONFIG_NF_TABLES=m |
93 | CONFIG_NF_TABLES_INET=m | 93 | CONFIG_NF_TABLES_INET=m |
94 | CONFIG_NF_TABLES_NETDEV=m | ||
94 | CONFIG_NFT_EXTHDR=m | 95 | CONFIG_NFT_EXTHDR=m |
95 | CONFIG_NFT_META=m | 96 | CONFIG_NFT_META=m |
96 | CONFIG_NFT_CT=m | 97 | CONFIG_NFT_CT=m |
@@ -287,7 +288,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
287 | CONFIG_BLK_DEV_DRBD=m | 288 | CONFIG_BLK_DEV_DRBD=m |
288 | CONFIG_BLK_DEV_NBD=m | 289 | CONFIG_BLK_DEV_NBD=m |
289 | CONFIG_BLK_DEV_RAM=y | 290 | CONFIG_BLK_DEV_RAM=y |
290 | CONFIG_BLK_DEV_PMEM=m | ||
291 | CONFIG_CDROM_PKTCDVD=m | 291 | CONFIG_CDROM_PKTCDVD=m |
292 | CONFIG_ATA_OVER_ETH=m | 292 | CONFIG_ATA_OVER_ETH=m |
293 | CONFIG_DUMMY_IRQ=m | 293 | CONFIG_DUMMY_IRQ=m |
@@ -344,6 +344,7 @@ CONFIG_MACVLAN=m | |||
344 | CONFIG_MACVTAP=m | 344 | CONFIG_MACVTAP=m |
345 | CONFIG_IPVLAN=m | 345 | CONFIG_IPVLAN=m |
346 | CONFIG_VXLAN=m | 346 | CONFIG_VXLAN=m |
347 | CONFIG_GENEVE=m | ||
347 | CONFIG_NETCONSOLE=m | 348 | CONFIG_NETCONSOLE=m |
348 | CONFIG_NETCONSOLE_DYNAMIC=y | 349 | CONFIG_NETCONSOLE_DYNAMIC=y |
349 | CONFIG_VETH=m | 350 | CONFIG_VETH=m |
@@ -354,6 +355,7 @@ CONFIG_ARIADNE=y | |||
354 | # CONFIG_NET_CADENCE is not set | 355 | # CONFIG_NET_CADENCE is not set |
355 | # CONFIG_NET_VENDOR_BROADCOM is not set | 356 | # CONFIG_NET_VENDOR_BROADCOM is not set |
356 | # CONFIG_NET_VENDOR_CIRRUS is not set | 357 | # CONFIG_NET_VENDOR_CIRRUS is not set |
358 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
357 | # CONFIG_NET_VENDOR_HP is not set | 359 | # CONFIG_NET_VENDOR_HP is not set |
358 | # CONFIG_NET_VENDOR_INTEL is not set | 360 | # CONFIG_NET_VENDOR_INTEL is not set |
359 | # CONFIG_NET_VENDOR_MARVELL is not set | 361 | # CONFIG_NET_VENDOR_MARVELL is not set |
@@ -362,6 +364,7 @@ CONFIG_HYDRA=y | |||
362 | CONFIG_APNE=y | 364 | CONFIG_APNE=y |
363 | CONFIG_ZORRO8390=y | 365 | CONFIG_ZORRO8390=y |
364 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 366 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
367 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
365 | # CONFIG_NET_VENDOR_ROCKER is not set | 368 | # CONFIG_NET_VENDOR_ROCKER is not set |
366 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 369 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
367 | # CONFIG_NET_VENDOR_SEEQ is not set | 370 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -447,6 +450,7 @@ CONFIG_UDF_FS=m | |||
447 | CONFIG_MSDOS_FS=m | 450 | CONFIG_MSDOS_FS=m |
448 | CONFIG_VFAT_FS=m | 451 | CONFIG_VFAT_FS=m |
449 | CONFIG_PROC_KCORE=y | 452 | CONFIG_PROC_KCORE=y |
453 | CONFIG_PROC_CHILDREN=y | ||
450 | CONFIG_TMPFS=y | 454 | CONFIG_TMPFS=y |
451 | CONFIG_AFFS_FS=m | 455 | CONFIG_AFFS_FS=m |
452 | CONFIG_ECRYPT_FS=m | 456 | CONFIG_ECRYPT_FS=m |
@@ -535,6 +539,7 @@ CONFIG_TEST_FIRMWARE=m | |||
535 | CONFIG_TEST_UDELAY=m | 539 | CONFIG_TEST_UDELAY=m |
536 | CONFIG_EARLY_PRINTK=y | 540 | CONFIG_EARLY_PRINTK=y |
537 | CONFIG_ENCRYPTED_KEYS=m | 541 | CONFIG_ENCRYPTED_KEYS=m |
542 | CONFIG_CRYPTO_RSA=m | ||
538 | CONFIG_CRYPTO_MANAGER=y | 543 | CONFIG_CRYPTO_MANAGER=y |
539 | CONFIG_CRYPTO_USER=m | 544 | CONFIG_CRYPTO_USER=m |
540 | CONFIG_CRYPTO_CRYPTD=m | 545 | CONFIG_CRYPTO_CRYPTD=m |
@@ -542,6 +547,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
542 | CONFIG_CRYPTO_TEST=m | 547 | CONFIG_CRYPTO_TEST=m |
543 | CONFIG_CRYPTO_CCM=m | 548 | CONFIG_CRYPTO_CCM=m |
544 | CONFIG_CRYPTO_GCM=m | 549 | CONFIG_CRYPTO_GCM=m |
550 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
545 | CONFIG_CRYPTO_CTS=m | 551 | CONFIG_CRYPTO_CTS=m |
546 | CONFIG_CRYPTO_LRW=m | 552 | CONFIG_CRYPTO_LRW=m |
547 | CONFIG_CRYPTO_PCBC=m | 553 | CONFIG_CRYPTO_PCBC=m |
@@ -570,14 +576,15 @@ CONFIG_CRYPTO_TEA=m | |||
570 | CONFIG_CRYPTO_TWOFISH=m | 576 | CONFIG_CRYPTO_TWOFISH=m |
571 | CONFIG_CRYPTO_ZLIB=m | 577 | CONFIG_CRYPTO_ZLIB=m |
572 | CONFIG_CRYPTO_LZO=m | 578 | CONFIG_CRYPTO_LZO=m |
579 | CONFIG_CRYPTO_842=m | ||
573 | CONFIG_CRYPTO_LZ4=m | 580 | CONFIG_CRYPTO_LZ4=m |
574 | CONFIG_CRYPTO_LZ4HC=m | 581 | CONFIG_CRYPTO_LZ4HC=m |
575 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 582 | CONFIG_CRYPTO_ANSI_CPRNG=m |
576 | CONFIG_CRYPTO_DRBG_MENU=m | ||
577 | CONFIG_CRYPTO_DRBG_HASH=y | 583 | CONFIG_CRYPTO_DRBG_HASH=y |
578 | CONFIG_CRYPTO_DRBG_CTR=y | 584 | CONFIG_CRYPTO_DRBG_CTR=y |
579 | CONFIG_CRYPTO_USER_API_HASH=m | 585 | CONFIG_CRYPTO_USER_API_HASH=m |
580 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 586 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
581 | CONFIG_CRYPTO_USER_API_RNG=m | 587 | CONFIG_CRYPTO_USER_API_RNG=m |
588 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
582 | # CONFIG_CRYPTO_HW is not set | 589 | # CONFIG_CRYPTO_HW is not set |
583 | CONFIG_XZ_DEC_TEST=m | 590 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index feaa7282b938..eeb3a8991fc4 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
55 | CONFIG_NET_IPGRE=m | 55 | CONFIG_NET_IPGRE=m |
56 | CONFIG_NET_IPVTI=m | 56 | CONFIG_NET_IPVTI=m |
57 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
58 | CONFIG_GENEVE=m | 58 | CONFIG_GENEVE_CORE=m |
59 | CONFIG_INET_AH=m | 59 | CONFIG_INET_AH=m |
60 | CONFIG_INET_ESP=m | 60 | CONFIG_INET_ESP=m |
61 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
89 | CONFIG_NF_CONNTRACK_TFTP=m | 89 | CONFIG_NF_CONNTRACK_TFTP=m |
90 | CONFIG_NF_TABLES=m | 90 | CONFIG_NF_TABLES=m |
91 | CONFIG_NF_TABLES_INET=m | 91 | CONFIG_NF_TABLES_INET=m |
92 | CONFIG_NF_TABLES_NETDEV=m | ||
92 | CONFIG_NFT_EXTHDR=m | 93 | CONFIG_NFT_EXTHDR=m |
93 | CONFIG_NFT_META=m | 94 | CONFIG_NFT_META=m |
94 | CONFIG_NFT_CT=m | 95 | CONFIG_NFT_CT=m |
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
279 | CONFIG_BLK_DEV_DRBD=m | 280 | CONFIG_BLK_DEV_DRBD=m |
280 | CONFIG_BLK_DEV_NBD=m | 281 | CONFIG_BLK_DEV_NBD=m |
281 | CONFIG_BLK_DEV_RAM=y | 282 | CONFIG_BLK_DEV_RAM=y |
282 | CONFIG_BLK_DEV_PMEM=m | ||
283 | CONFIG_CDROM_PKTCDVD=m | 283 | CONFIG_CDROM_PKTCDVD=m |
284 | CONFIG_ATA_OVER_ETH=m | 284 | CONFIG_ATA_OVER_ETH=m |
285 | CONFIG_DUMMY_IRQ=m | 285 | CONFIG_DUMMY_IRQ=m |
@@ -326,17 +326,20 @@ CONFIG_MACVLAN=m | |||
326 | CONFIG_MACVTAP=m | 326 | CONFIG_MACVTAP=m |
327 | CONFIG_IPVLAN=m | 327 | CONFIG_IPVLAN=m |
328 | CONFIG_VXLAN=m | 328 | CONFIG_VXLAN=m |
329 | CONFIG_GENEVE=m | ||
329 | CONFIG_NETCONSOLE=m | 330 | CONFIG_NETCONSOLE=m |
330 | CONFIG_NETCONSOLE_DYNAMIC=y | 331 | CONFIG_NETCONSOLE_DYNAMIC=y |
331 | CONFIG_VETH=m | 332 | CONFIG_VETH=m |
332 | # CONFIG_NET_VENDOR_ARC is not set | 333 | # CONFIG_NET_VENDOR_ARC is not set |
333 | # CONFIG_NET_CADENCE is not set | 334 | # CONFIG_NET_CADENCE is not set |
334 | # CONFIG_NET_VENDOR_BROADCOM is not set | 335 | # CONFIG_NET_VENDOR_BROADCOM is not set |
336 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
335 | # CONFIG_NET_VENDOR_INTEL is not set | 337 | # CONFIG_NET_VENDOR_INTEL is not set |
336 | # CONFIG_NET_VENDOR_MARVELL is not set | 338 | # CONFIG_NET_VENDOR_MARVELL is not set |
337 | # CONFIG_NET_VENDOR_MICREL is not set | 339 | # CONFIG_NET_VENDOR_MICREL is not set |
338 | # CONFIG_NET_VENDOR_NATSEMI is not set | 340 | # CONFIG_NET_VENDOR_NATSEMI is not set |
339 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 341 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
342 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
340 | # CONFIG_NET_VENDOR_ROCKER is not set | 343 | # CONFIG_NET_VENDOR_ROCKER is not set |
341 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 344 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
342 | # CONFIG_NET_VENDOR_SEEQ is not set | 345 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -405,6 +408,7 @@ CONFIG_UDF_FS=m | |||
405 | CONFIG_MSDOS_FS=m | 408 | CONFIG_MSDOS_FS=m |
406 | CONFIG_VFAT_FS=m | 409 | CONFIG_VFAT_FS=m |
407 | CONFIG_PROC_KCORE=y | 410 | CONFIG_PROC_KCORE=y |
411 | CONFIG_PROC_CHILDREN=y | ||
408 | CONFIG_TMPFS=y | 412 | CONFIG_TMPFS=y |
409 | CONFIG_AFFS_FS=m | 413 | CONFIG_AFFS_FS=m |
410 | CONFIG_ECRYPT_FS=m | 414 | CONFIG_ECRYPT_FS=m |
@@ -493,6 +497,7 @@ CONFIG_TEST_FIRMWARE=m | |||
493 | CONFIG_TEST_UDELAY=m | 497 | CONFIG_TEST_UDELAY=m |
494 | CONFIG_EARLY_PRINTK=y | 498 | CONFIG_EARLY_PRINTK=y |
495 | CONFIG_ENCRYPTED_KEYS=m | 499 | CONFIG_ENCRYPTED_KEYS=m |
500 | CONFIG_CRYPTO_RSA=m | ||
496 | CONFIG_CRYPTO_MANAGER=y | 501 | CONFIG_CRYPTO_MANAGER=y |
497 | CONFIG_CRYPTO_USER=m | 502 | CONFIG_CRYPTO_USER=m |
498 | CONFIG_CRYPTO_CRYPTD=m | 503 | CONFIG_CRYPTO_CRYPTD=m |
@@ -500,6 +505,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
500 | CONFIG_CRYPTO_TEST=m | 505 | CONFIG_CRYPTO_TEST=m |
501 | CONFIG_CRYPTO_CCM=m | 506 | CONFIG_CRYPTO_CCM=m |
502 | CONFIG_CRYPTO_GCM=m | 507 | CONFIG_CRYPTO_GCM=m |
508 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
503 | CONFIG_CRYPTO_CTS=m | 509 | CONFIG_CRYPTO_CTS=m |
504 | CONFIG_CRYPTO_LRW=m | 510 | CONFIG_CRYPTO_LRW=m |
505 | CONFIG_CRYPTO_PCBC=m | 511 | CONFIG_CRYPTO_PCBC=m |
@@ -528,14 +534,15 @@ CONFIG_CRYPTO_TEA=m | |||
528 | CONFIG_CRYPTO_TWOFISH=m | 534 | CONFIG_CRYPTO_TWOFISH=m |
529 | CONFIG_CRYPTO_ZLIB=m | 535 | CONFIG_CRYPTO_ZLIB=m |
530 | CONFIG_CRYPTO_LZO=m | 536 | CONFIG_CRYPTO_LZO=m |
537 | CONFIG_CRYPTO_842=m | ||
531 | CONFIG_CRYPTO_LZ4=m | 538 | CONFIG_CRYPTO_LZ4=m |
532 | CONFIG_CRYPTO_LZ4HC=m | 539 | CONFIG_CRYPTO_LZ4HC=m |
533 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 540 | CONFIG_CRYPTO_ANSI_CPRNG=m |
534 | CONFIG_CRYPTO_DRBG_MENU=m | ||
535 | CONFIG_CRYPTO_DRBG_HASH=y | 541 | CONFIG_CRYPTO_DRBG_HASH=y |
536 | CONFIG_CRYPTO_DRBG_CTR=y | 542 | CONFIG_CRYPTO_DRBG_CTR=y |
537 | CONFIG_CRYPTO_USER_API_HASH=m | 543 | CONFIG_CRYPTO_USER_API_HASH=m |
538 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 544 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
539 | CONFIG_CRYPTO_USER_API_RNG=m | 545 | CONFIG_CRYPTO_USER_API_RNG=m |
546 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
540 | # CONFIG_CRYPTO_HW is not set | 547 | # CONFIG_CRYPTO_HW is not set |
541 | CONFIG_XZ_DEC_TEST=m | 548 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index bdf0fddaa458..3a7006654ce9 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
55 | CONFIG_NET_IPGRE=m | 55 | CONFIG_NET_IPGRE=m |
56 | CONFIG_NET_IPVTI=m | 56 | CONFIG_NET_IPVTI=m |
57 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
58 | CONFIG_GENEVE=m | 58 | CONFIG_GENEVE_CORE=m |
59 | CONFIG_INET_AH=m | 59 | CONFIG_INET_AH=m |
60 | CONFIG_INET_ESP=m | 60 | CONFIG_INET_ESP=m |
61 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
89 | CONFIG_NF_CONNTRACK_TFTP=m | 89 | CONFIG_NF_CONNTRACK_TFTP=m |
90 | CONFIG_NF_TABLES=m | 90 | CONFIG_NF_TABLES=m |
91 | CONFIG_NF_TABLES_INET=m | 91 | CONFIG_NF_TABLES_INET=m |
92 | CONFIG_NF_TABLES_NETDEV=m | ||
92 | CONFIG_NFT_EXTHDR=m | 93 | CONFIG_NFT_EXTHDR=m |
93 | CONFIG_NFT_META=m | 94 | CONFIG_NFT_META=m |
94 | CONFIG_NFT_CT=m | 95 | CONFIG_NFT_CT=m |
@@ -283,7 +284,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
283 | CONFIG_BLK_DEV_DRBD=m | 284 | CONFIG_BLK_DEV_DRBD=m |
284 | CONFIG_BLK_DEV_NBD=m | 285 | CONFIG_BLK_DEV_NBD=m |
285 | CONFIG_BLK_DEV_RAM=y | 286 | CONFIG_BLK_DEV_RAM=y |
286 | CONFIG_BLK_DEV_PMEM=m | ||
287 | CONFIG_CDROM_PKTCDVD=m | 287 | CONFIG_CDROM_PKTCDVD=m |
288 | CONFIG_ATA_OVER_ETH=m | 288 | CONFIG_ATA_OVER_ETH=m |
289 | CONFIG_DUMMY_IRQ=m | 289 | CONFIG_DUMMY_IRQ=m |
@@ -335,6 +335,7 @@ CONFIG_MACVLAN=m | |||
335 | CONFIG_MACVTAP=m | 335 | CONFIG_MACVTAP=m |
336 | CONFIG_IPVLAN=m | 336 | CONFIG_IPVLAN=m |
337 | CONFIG_VXLAN=m | 337 | CONFIG_VXLAN=m |
338 | CONFIG_GENEVE=m | ||
338 | CONFIG_NETCONSOLE=m | 339 | CONFIG_NETCONSOLE=m |
339 | CONFIG_NETCONSOLE_DYNAMIC=y | 340 | CONFIG_NETCONSOLE_DYNAMIC=y |
340 | CONFIG_VETH=m | 341 | CONFIG_VETH=m |
@@ -342,11 +343,13 @@ CONFIG_ATARILANCE=y | |||
342 | # CONFIG_NET_VENDOR_ARC is not set | 343 | # CONFIG_NET_VENDOR_ARC is not set |
343 | # CONFIG_NET_CADENCE is not set | 344 | # CONFIG_NET_CADENCE is not set |
344 | # CONFIG_NET_VENDOR_BROADCOM is not set | 345 | # CONFIG_NET_VENDOR_BROADCOM is not set |
346 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
345 | # CONFIG_NET_VENDOR_INTEL is not set | 347 | # CONFIG_NET_VENDOR_INTEL is not set |
346 | # CONFIG_NET_VENDOR_MARVELL is not set | 348 | # CONFIG_NET_VENDOR_MARVELL is not set |
347 | # CONFIG_NET_VENDOR_MICREL is not set | 349 | # CONFIG_NET_VENDOR_MICREL is not set |
348 | CONFIG_NE2000=y | 350 | CONFIG_NE2000=y |
349 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 351 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
352 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
350 | # CONFIG_NET_VENDOR_ROCKER is not set | 353 | # CONFIG_NET_VENDOR_ROCKER is not set |
351 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 354 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
352 | # CONFIG_NET_VENDOR_SEEQ is not set | 355 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -427,6 +430,7 @@ CONFIG_UDF_FS=m | |||
427 | CONFIG_MSDOS_FS=m | 430 | CONFIG_MSDOS_FS=m |
428 | CONFIG_VFAT_FS=m | 431 | CONFIG_VFAT_FS=m |
429 | CONFIG_PROC_KCORE=y | 432 | CONFIG_PROC_KCORE=y |
433 | CONFIG_PROC_CHILDREN=y | ||
430 | CONFIG_TMPFS=y | 434 | CONFIG_TMPFS=y |
431 | CONFIG_AFFS_FS=m | 435 | CONFIG_AFFS_FS=m |
432 | CONFIG_ECRYPT_FS=m | 436 | CONFIG_ECRYPT_FS=m |
@@ -515,6 +519,7 @@ CONFIG_TEST_FIRMWARE=m | |||
515 | CONFIG_TEST_UDELAY=m | 519 | CONFIG_TEST_UDELAY=m |
516 | CONFIG_EARLY_PRINTK=y | 520 | CONFIG_EARLY_PRINTK=y |
517 | CONFIG_ENCRYPTED_KEYS=m | 521 | CONFIG_ENCRYPTED_KEYS=m |
522 | CONFIG_CRYPTO_RSA=m | ||
518 | CONFIG_CRYPTO_MANAGER=y | 523 | CONFIG_CRYPTO_MANAGER=y |
519 | CONFIG_CRYPTO_USER=m | 524 | CONFIG_CRYPTO_USER=m |
520 | CONFIG_CRYPTO_CRYPTD=m | 525 | CONFIG_CRYPTO_CRYPTD=m |
@@ -522,6 +527,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
522 | CONFIG_CRYPTO_TEST=m | 527 | CONFIG_CRYPTO_TEST=m |
523 | CONFIG_CRYPTO_CCM=m | 528 | CONFIG_CRYPTO_CCM=m |
524 | CONFIG_CRYPTO_GCM=m | 529 | CONFIG_CRYPTO_GCM=m |
530 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
525 | CONFIG_CRYPTO_CTS=m | 531 | CONFIG_CRYPTO_CTS=m |
526 | CONFIG_CRYPTO_LRW=m | 532 | CONFIG_CRYPTO_LRW=m |
527 | CONFIG_CRYPTO_PCBC=m | 533 | CONFIG_CRYPTO_PCBC=m |
@@ -550,14 +556,15 @@ CONFIG_CRYPTO_TEA=m | |||
550 | CONFIG_CRYPTO_TWOFISH=m | 556 | CONFIG_CRYPTO_TWOFISH=m |
551 | CONFIG_CRYPTO_ZLIB=m | 557 | CONFIG_CRYPTO_ZLIB=m |
552 | CONFIG_CRYPTO_LZO=m | 558 | CONFIG_CRYPTO_LZO=m |
559 | CONFIG_CRYPTO_842=m | ||
553 | CONFIG_CRYPTO_LZ4=m | 560 | CONFIG_CRYPTO_LZ4=m |
554 | CONFIG_CRYPTO_LZ4HC=m | 561 | CONFIG_CRYPTO_LZ4HC=m |
555 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 562 | CONFIG_CRYPTO_ANSI_CPRNG=m |
556 | CONFIG_CRYPTO_DRBG_MENU=m | ||
557 | CONFIG_CRYPTO_DRBG_HASH=y | 563 | CONFIG_CRYPTO_DRBG_HASH=y |
558 | CONFIG_CRYPTO_DRBG_CTR=y | 564 | CONFIG_CRYPTO_DRBG_CTR=y |
559 | CONFIG_CRYPTO_USER_API_HASH=m | 565 | CONFIG_CRYPTO_USER_API_HASH=m |
560 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 566 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
561 | CONFIG_CRYPTO_USER_API_RNG=m | 567 | CONFIG_CRYPTO_USER_API_RNG=m |
568 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
562 | # CONFIG_CRYPTO_HW is not set | 569 | # CONFIG_CRYPTO_HW is not set |
563 | CONFIG_XZ_DEC_TEST=m | 570 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index dc92ab3527a9..0586b323a673 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
53 | CONFIG_NET_IPGRE=m | 53 | CONFIG_NET_IPGRE=m |
54 | CONFIG_NET_IPVTI=m | 54 | CONFIG_NET_IPVTI=m |
55 | CONFIG_NET_FOU_IP_TUNNELS=y | 55 | CONFIG_NET_FOU_IP_TUNNELS=y |
56 | CONFIG_GENEVE=m | 56 | CONFIG_GENEVE_CORE=m |
57 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
58 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
59 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
87 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
88 | CONFIG_NF_TABLES=m | 88 | CONFIG_NF_TABLES=m |
89 | CONFIG_NF_TABLES_INET=m | 89 | CONFIG_NF_TABLES_INET=m |
90 | CONFIG_NF_TABLES_NETDEV=m | ||
90 | CONFIG_NFT_EXTHDR=m | 91 | CONFIG_NFT_EXTHDR=m |
91 | CONFIG_NFT_META=m | 92 | CONFIG_NFT_META=m |
92 | CONFIG_NFT_CT=m | 93 | CONFIG_NFT_CT=m |
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
277 | CONFIG_BLK_DEV_DRBD=m | 278 | CONFIG_BLK_DEV_DRBD=m |
278 | CONFIG_BLK_DEV_NBD=m | 279 | CONFIG_BLK_DEV_NBD=m |
279 | CONFIG_BLK_DEV_RAM=y | 280 | CONFIG_BLK_DEV_RAM=y |
280 | CONFIG_BLK_DEV_PMEM=m | ||
281 | CONFIG_CDROM_PKTCDVD=m | 281 | CONFIG_CDROM_PKTCDVD=m |
282 | CONFIG_ATA_OVER_ETH=m | 282 | CONFIG_ATA_OVER_ETH=m |
283 | CONFIG_DUMMY_IRQ=m | 283 | CONFIG_DUMMY_IRQ=m |
@@ -325,17 +325,20 @@ CONFIG_MACVLAN=m | |||
325 | CONFIG_MACVTAP=m | 325 | CONFIG_MACVTAP=m |
326 | CONFIG_IPVLAN=m | 326 | CONFIG_IPVLAN=m |
327 | CONFIG_VXLAN=m | 327 | CONFIG_VXLAN=m |
328 | CONFIG_GENEVE=m | ||
328 | CONFIG_NETCONSOLE=m | 329 | CONFIG_NETCONSOLE=m |
329 | CONFIG_NETCONSOLE_DYNAMIC=y | 330 | CONFIG_NETCONSOLE_DYNAMIC=y |
330 | CONFIG_VETH=m | 331 | CONFIG_VETH=m |
331 | # CONFIG_NET_VENDOR_ARC is not set | 332 | # CONFIG_NET_VENDOR_ARC is not set |
332 | # CONFIG_NET_CADENCE is not set | 333 | # CONFIG_NET_CADENCE is not set |
333 | # CONFIG_NET_VENDOR_BROADCOM is not set | 334 | # CONFIG_NET_VENDOR_BROADCOM is not set |
335 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
334 | CONFIG_BVME6000_NET=y | 336 | CONFIG_BVME6000_NET=y |
335 | # CONFIG_NET_VENDOR_MARVELL is not set | 337 | # CONFIG_NET_VENDOR_MARVELL is not set |
336 | # CONFIG_NET_VENDOR_MICREL is not set | 338 | # CONFIG_NET_VENDOR_MICREL is not set |
337 | # CONFIG_NET_VENDOR_NATSEMI is not set | 339 | # CONFIG_NET_VENDOR_NATSEMI is not set |
338 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 340 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
341 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
339 | # CONFIG_NET_VENDOR_ROCKER is not set | 342 | # CONFIG_NET_VENDOR_ROCKER is not set |
340 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 343 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
341 | # CONFIG_NET_VENDOR_SEEQ is not set | 344 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m | |||
398 | CONFIG_MSDOS_FS=m | 401 | CONFIG_MSDOS_FS=m |
399 | CONFIG_VFAT_FS=m | 402 | CONFIG_VFAT_FS=m |
400 | CONFIG_PROC_KCORE=y | 403 | CONFIG_PROC_KCORE=y |
404 | CONFIG_PROC_CHILDREN=y | ||
401 | CONFIG_TMPFS=y | 405 | CONFIG_TMPFS=y |
402 | CONFIG_AFFS_FS=m | 406 | CONFIG_AFFS_FS=m |
403 | CONFIG_ECRYPT_FS=m | 407 | CONFIG_ECRYPT_FS=m |
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m | |||
486 | CONFIG_TEST_UDELAY=m | 490 | CONFIG_TEST_UDELAY=m |
487 | CONFIG_EARLY_PRINTK=y | 491 | CONFIG_EARLY_PRINTK=y |
488 | CONFIG_ENCRYPTED_KEYS=m | 492 | CONFIG_ENCRYPTED_KEYS=m |
493 | CONFIG_CRYPTO_RSA=m | ||
489 | CONFIG_CRYPTO_MANAGER=y | 494 | CONFIG_CRYPTO_MANAGER=y |
490 | CONFIG_CRYPTO_USER=m | 495 | CONFIG_CRYPTO_USER=m |
491 | CONFIG_CRYPTO_CRYPTD=m | 496 | CONFIG_CRYPTO_CRYPTD=m |
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
493 | CONFIG_CRYPTO_TEST=m | 498 | CONFIG_CRYPTO_TEST=m |
494 | CONFIG_CRYPTO_CCM=m | 499 | CONFIG_CRYPTO_CCM=m |
495 | CONFIG_CRYPTO_GCM=m | 500 | CONFIG_CRYPTO_GCM=m |
501 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
496 | CONFIG_CRYPTO_CTS=m | 502 | CONFIG_CRYPTO_CTS=m |
497 | CONFIG_CRYPTO_LRW=m | 503 | CONFIG_CRYPTO_LRW=m |
498 | CONFIG_CRYPTO_PCBC=m | 504 | CONFIG_CRYPTO_PCBC=m |
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m | |||
521 | CONFIG_CRYPTO_TWOFISH=m | 527 | CONFIG_CRYPTO_TWOFISH=m |
522 | CONFIG_CRYPTO_ZLIB=m | 528 | CONFIG_CRYPTO_ZLIB=m |
523 | CONFIG_CRYPTO_LZO=m | 529 | CONFIG_CRYPTO_LZO=m |
530 | CONFIG_CRYPTO_842=m | ||
524 | CONFIG_CRYPTO_LZ4=m | 531 | CONFIG_CRYPTO_LZ4=m |
525 | CONFIG_CRYPTO_LZ4HC=m | 532 | CONFIG_CRYPTO_LZ4HC=m |
526 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 533 | CONFIG_CRYPTO_ANSI_CPRNG=m |
527 | CONFIG_CRYPTO_DRBG_MENU=m | ||
528 | CONFIG_CRYPTO_DRBG_HASH=y | 534 | CONFIG_CRYPTO_DRBG_HASH=y |
529 | CONFIG_CRYPTO_DRBG_CTR=y | 535 | CONFIG_CRYPTO_DRBG_CTR=y |
530 | CONFIG_CRYPTO_USER_API_HASH=m | 536 | CONFIG_CRYPTO_USER_API_HASH=m |
531 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 537 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
532 | CONFIG_CRYPTO_USER_API_RNG=m | 538 | CONFIG_CRYPTO_USER_API_RNG=m |
539 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
533 | # CONFIG_CRYPTO_HW is not set | 540 | # CONFIG_CRYPTO_HW is not set |
534 | CONFIG_XZ_DEC_TEST=m | 541 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 592ae86b6716..ad1dbce07aa4 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -55,7 +55,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
55 | CONFIG_NET_IPGRE=m | 55 | CONFIG_NET_IPGRE=m |
56 | CONFIG_NET_IPVTI=m | 56 | CONFIG_NET_IPVTI=m |
57 | CONFIG_NET_FOU_IP_TUNNELS=y | 57 | CONFIG_NET_FOU_IP_TUNNELS=y |
58 | CONFIG_GENEVE=m | 58 | CONFIG_GENEVE_CORE=m |
59 | CONFIG_INET_AH=m | 59 | CONFIG_INET_AH=m |
60 | CONFIG_INET_ESP=m | 60 | CONFIG_INET_ESP=m |
61 | CONFIG_INET_IPCOMP=m | 61 | CONFIG_INET_IPCOMP=m |
@@ -89,6 +89,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
89 | CONFIG_NF_CONNTRACK_TFTP=m | 89 | CONFIG_NF_CONNTRACK_TFTP=m |
90 | CONFIG_NF_TABLES=m | 90 | CONFIG_NF_TABLES=m |
91 | CONFIG_NF_TABLES_INET=m | 91 | CONFIG_NF_TABLES_INET=m |
92 | CONFIG_NF_TABLES_NETDEV=m | ||
92 | CONFIG_NFT_EXTHDR=m | 93 | CONFIG_NFT_EXTHDR=m |
93 | CONFIG_NFT_META=m | 94 | CONFIG_NFT_META=m |
94 | CONFIG_NFT_CT=m | 95 | CONFIG_NFT_CT=m |
@@ -279,7 +280,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
279 | CONFIG_BLK_DEV_DRBD=m | 280 | CONFIG_BLK_DEV_DRBD=m |
280 | CONFIG_BLK_DEV_NBD=m | 281 | CONFIG_BLK_DEV_NBD=m |
281 | CONFIG_BLK_DEV_RAM=y | 282 | CONFIG_BLK_DEV_RAM=y |
282 | CONFIG_BLK_DEV_PMEM=m | ||
283 | CONFIG_CDROM_PKTCDVD=m | 283 | CONFIG_CDROM_PKTCDVD=m |
284 | CONFIG_ATA_OVER_ETH=m | 284 | CONFIG_ATA_OVER_ETH=m |
285 | CONFIG_DUMMY_IRQ=m | 285 | CONFIG_DUMMY_IRQ=m |
@@ -326,6 +326,7 @@ CONFIG_MACVLAN=m | |||
326 | CONFIG_MACVTAP=m | 326 | CONFIG_MACVTAP=m |
327 | CONFIG_IPVLAN=m | 327 | CONFIG_IPVLAN=m |
328 | CONFIG_VXLAN=m | 328 | CONFIG_VXLAN=m |
329 | CONFIG_GENEVE=m | ||
329 | CONFIG_NETCONSOLE=m | 330 | CONFIG_NETCONSOLE=m |
330 | CONFIG_NETCONSOLE_DYNAMIC=y | 331 | CONFIG_NETCONSOLE_DYNAMIC=y |
331 | CONFIG_VETH=m | 332 | CONFIG_VETH=m |
@@ -333,11 +334,13 @@ CONFIG_HPLANCE=y | |||
333 | # CONFIG_NET_VENDOR_ARC is not set | 334 | # CONFIG_NET_VENDOR_ARC is not set |
334 | # CONFIG_NET_CADENCE is not set | 335 | # CONFIG_NET_CADENCE is not set |
335 | # CONFIG_NET_VENDOR_BROADCOM is not set | 336 | # CONFIG_NET_VENDOR_BROADCOM is not set |
337 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
336 | # CONFIG_NET_VENDOR_INTEL is not set | 338 | # CONFIG_NET_VENDOR_INTEL is not set |
337 | # CONFIG_NET_VENDOR_MARVELL is not set | 339 | # CONFIG_NET_VENDOR_MARVELL is not set |
338 | # CONFIG_NET_VENDOR_MICREL is not set | 340 | # CONFIG_NET_VENDOR_MICREL is not set |
339 | # CONFIG_NET_VENDOR_NATSEMI is not set | 341 | # CONFIG_NET_VENDOR_NATSEMI is not set |
340 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 342 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
343 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
341 | # CONFIG_NET_VENDOR_ROCKER is not set | 344 | # CONFIG_NET_VENDOR_ROCKER is not set |
342 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 345 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
343 | # CONFIG_NET_VENDOR_SEEQ is not set | 346 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -407,6 +410,7 @@ CONFIG_UDF_FS=m | |||
407 | CONFIG_MSDOS_FS=m | 410 | CONFIG_MSDOS_FS=m |
408 | CONFIG_VFAT_FS=m | 411 | CONFIG_VFAT_FS=m |
409 | CONFIG_PROC_KCORE=y | 412 | CONFIG_PROC_KCORE=y |
413 | CONFIG_PROC_CHILDREN=y | ||
410 | CONFIG_TMPFS=y | 414 | CONFIG_TMPFS=y |
411 | CONFIG_AFFS_FS=m | 415 | CONFIG_AFFS_FS=m |
412 | CONFIG_ECRYPT_FS=m | 416 | CONFIG_ECRYPT_FS=m |
@@ -495,6 +499,7 @@ CONFIG_TEST_FIRMWARE=m | |||
495 | CONFIG_TEST_UDELAY=m | 499 | CONFIG_TEST_UDELAY=m |
496 | CONFIG_EARLY_PRINTK=y | 500 | CONFIG_EARLY_PRINTK=y |
497 | CONFIG_ENCRYPTED_KEYS=m | 501 | CONFIG_ENCRYPTED_KEYS=m |
502 | CONFIG_CRYPTO_RSA=m | ||
498 | CONFIG_CRYPTO_MANAGER=y | 503 | CONFIG_CRYPTO_MANAGER=y |
499 | CONFIG_CRYPTO_USER=m | 504 | CONFIG_CRYPTO_USER=m |
500 | CONFIG_CRYPTO_CRYPTD=m | 505 | CONFIG_CRYPTO_CRYPTD=m |
@@ -502,6 +507,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
502 | CONFIG_CRYPTO_TEST=m | 507 | CONFIG_CRYPTO_TEST=m |
503 | CONFIG_CRYPTO_CCM=m | 508 | CONFIG_CRYPTO_CCM=m |
504 | CONFIG_CRYPTO_GCM=m | 509 | CONFIG_CRYPTO_GCM=m |
510 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
505 | CONFIG_CRYPTO_CTS=m | 511 | CONFIG_CRYPTO_CTS=m |
506 | CONFIG_CRYPTO_LRW=m | 512 | CONFIG_CRYPTO_LRW=m |
507 | CONFIG_CRYPTO_PCBC=m | 513 | CONFIG_CRYPTO_PCBC=m |
@@ -530,14 +536,15 @@ CONFIG_CRYPTO_TEA=m | |||
530 | CONFIG_CRYPTO_TWOFISH=m | 536 | CONFIG_CRYPTO_TWOFISH=m |
531 | CONFIG_CRYPTO_ZLIB=m | 537 | CONFIG_CRYPTO_ZLIB=m |
532 | CONFIG_CRYPTO_LZO=m | 538 | CONFIG_CRYPTO_LZO=m |
539 | CONFIG_CRYPTO_842=m | ||
533 | CONFIG_CRYPTO_LZ4=m | 540 | CONFIG_CRYPTO_LZ4=m |
534 | CONFIG_CRYPTO_LZ4HC=m | 541 | CONFIG_CRYPTO_LZ4HC=m |
535 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 542 | CONFIG_CRYPTO_ANSI_CPRNG=m |
536 | CONFIG_CRYPTO_DRBG_MENU=m | ||
537 | CONFIG_CRYPTO_DRBG_HASH=y | 543 | CONFIG_CRYPTO_DRBG_HASH=y |
538 | CONFIG_CRYPTO_DRBG_CTR=y | 544 | CONFIG_CRYPTO_DRBG_CTR=y |
539 | CONFIG_CRYPTO_USER_API_HASH=m | 545 | CONFIG_CRYPTO_USER_API_HASH=m |
540 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 546 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
541 | CONFIG_CRYPTO_USER_API_RNG=m | 547 | CONFIG_CRYPTO_USER_API_RNG=m |
548 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
542 | # CONFIG_CRYPTO_HW is not set | 549 | # CONFIG_CRYPTO_HW is not set |
543 | CONFIG_XZ_DEC_TEST=m | 550 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 1381eed7702d..b44acacaecf4 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -54,7 +54,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
54 | CONFIG_NET_IPGRE=m | 54 | CONFIG_NET_IPGRE=m |
55 | CONFIG_NET_IPVTI=m | 55 | CONFIG_NET_IPVTI=m |
56 | CONFIG_NET_FOU_IP_TUNNELS=y | 56 | CONFIG_NET_FOU_IP_TUNNELS=y |
57 | CONFIG_GENEVE=m | 57 | CONFIG_GENEVE_CORE=m |
58 | CONFIG_INET_AH=m | 58 | CONFIG_INET_AH=m |
59 | CONFIG_INET_ESP=m | 59 | CONFIG_INET_ESP=m |
60 | CONFIG_INET_IPCOMP=m | 60 | CONFIG_INET_IPCOMP=m |
@@ -88,6 +88,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
88 | CONFIG_NF_CONNTRACK_TFTP=m | 88 | CONFIG_NF_CONNTRACK_TFTP=m |
89 | CONFIG_NF_TABLES=m | 89 | CONFIG_NF_TABLES=m |
90 | CONFIG_NF_TABLES_INET=m | 90 | CONFIG_NF_TABLES_INET=m |
91 | CONFIG_NF_TABLES_NETDEV=m | ||
91 | CONFIG_NFT_EXTHDR=m | 92 | CONFIG_NFT_EXTHDR=m |
92 | CONFIG_NFT_META=m | 93 | CONFIG_NFT_META=m |
93 | CONFIG_NFT_CT=m | 94 | CONFIG_NFT_CT=m |
@@ -282,7 +283,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
282 | CONFIG_BLK_DEV_DRBD=m | 283 | CONFIG_BLK_DEV_DRBD=m |
283 | CONFIG_BLK_DEV_NBD=m | 284 | CONFIG_BLK_DEV_NBD=m |
284 | CONFIG_BLK_DEV_RAM=y | 285 | CONFIG_BLK_DEV_RAM=y |
285 | CONFIG_BLK_DEV_PMEM=m | ||
286 | CONFIG_CDROM_PKTCDVD=m | 286 | CONFIG_CDROM_PKTCDVD=m |
287 | CONFIG_ATA_OVER_ETH=m | 287 | CONFIG_ATA_OVER_ETH=m |
288 | CONFIG_DUMMY_IRQ=m | 288 | CONFIG_DUMMY_IRQ=m |
@@ -342,6 +342,7 @@ CONFIG_MACVLAN=m | |||
342 | CONFIG_MACVTAP=m | 342 | CONFIG_MACVTAP=m |
343 | CONFIG_IPVLAN=m | 343 | CONFIG_IPVLAN=m |
344 | CONFIG_VXLAN=m | 344 | CONFIG_VXLAN=m |
345 | CONFIG_GENEVE=m | ||
345 | CONFIG_NETCONSOLE=m | 346 | CONFIG_NETCONSOLE=m |
346 | CONFIG_NETCONSOLE_DYNAMIC=y | 347 | CONFIG_NETCONSOLE_DYNAMIC=y |
347 | CONFIG_VETH=m | 348 | CONFIG_VETH=m |
@@ -350,12 +351,14 @@ CONFIG_MACMACE=y | |||
350 | # CONFIG_NET_CADENCE is not set | 351 | # CONFIG_NET_CADENCE is not set |
351 | # CONFIG_NET_VENDOR_BROADCOM is not set | 352 | # CONFIG_NET_VENDOR_BROADCOM is not set |
352 | CONFIG_MAC89x0=y | 353 | CONFIG_MAC89x0=y |
354 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
353 | # CONFIG_NET_VENDOR_INTEL is not set | 355 | # CONFIG_NET_VENDOR_INTEL is not set |
354 | # CONFIG_NET_VENDOR_MARVELL is not set | 356 | # CONFIG_NET_VENDOR_MARVELL is not set |
355 | # CONFIG_NET_VENDOR_MICREL is not set | 357 | # CONFIG_NET_VENDOR_MICREL is not set |
356 | CONFIG_MACSONIC=y | 358 | CONFIG_MACSONIC=y |
357 | CONFIG_MAC8390=y | 359 | CONFIG_MAC8390=y |
358 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 360 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
361 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
359 | # CONFIG_NET_VENDOR_ROCKER is not set | 362 | # CONFIG_NET_VENDOR_ROCKER is not set |
360 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 363 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
361 | # CONFIG_NET_VENDOR_SEEQ is not set | 364 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -429,6 +432,7 @@ CONFIG_UDF_FS=m | |||
429 | CONFIG_MSDOS_FS=m | 432 | CONFIG_MSDOS_FS=m |
430 | CONFIG_VFAT_FS=m | 433 | CONFIG_VFAT_FS=m |
431 | CONFIG_PROC_KCORE=y | 434 | CONFIG_PROC_KCORE=y |
435 | CONFIG_PROC_CHILDREN=y | ||
432 | CONFIG_TMPFS=y | 436 | CONFIG_TMPFS=y |
433 | CONFIG_AFFS_FS=m | 437 | CONFIG_AFFS_FS=m |
434 | CONFIG_ECRYPT_FS=m | 438 | CONFIG_ECRYPT_FS=m |
@@ -517,6 +521,7 @@ CONFIG_TEST_FIRMWARE=m | |||
517 | CONFIG_TEST_UDELAY=m | 521 | CONFIG_TEST_UDELAY=m |
518 | CONFIG_EARLY_PRINTK=y | 522 | CONFIG_EARLY_PRINTK=y |
519 | CONFIG_ENCRYPTED_KEYS=m | 523 | CONFIG_ENCRYPTED_KEYS=m |
524 | CONFIG_CRYPTO_RSA=m | ||
520 | CONFIG_CRYPTO_MANAGER=y | 525 | CONFIG_CRYPTO_MANAGER=y |
521 | CONFIG_CRYPTO_USER=m | 526 | CONFIG_CRYPTO_USER=m |
522 | CONFIG_CRYPTO_CRYPTD=m | 527 | CONFIG_CRYPTO_CRYPTD=m |
@@ -524,6 +529,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
524 | CONFIG_CRYPTO_TEST=m | 529 | CONFIG_CRYPTO_TEST=m |
525 | CONFIG_CRYPTO_CCM=m | 530 | CONFIG_CRYPTO_CCM=m |
526 | CONFIG_CRYPTO_GCM=m | 531 | CONFIG_CRYPTO_GCM=m |
532 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
527 | CONFIG_CRYPTO_CTS=m | 533 | CONFIG_CRYPTO_CTS=m |
528 | CONFIG_CRYPTO_LRW=m | 534 | CONFIG_CRYPTO_LRW=m |
529 | CONFIG_CRYPTO_PCBC=m | 535 | CONFIG_CRYPTO_PCBC=m |
@@ -552,14 +558,15 @@ CONFIG_CRYPTO_TEA=m | |||
552 | CONFIG_CRYPTO_TWOFISH=m | 558 | CONFIG_CRYPTO_TWOFISH=m |
553 | CONFIG_CRYPTO_ZLIB=m | 559 | CONFIG_CRYPTO_ZLIB=m |
554 | CONFIG_CRYPTO_LZO=m | 560 | CONFIG_CRYPTO_LZO=m |
561 | CONFIG_CRYPTO_842=m | ||
555 | CONFIG_CRYPTO_LZ4=m | 562 | CONFIG_CRYPTO_LZ4=m |
556 | CONFIG_CRYPTO_LZ4HC=m | 563 | CONFIG_CRYPTO_LZ4HC=m |
557 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 564 | CONFIG_CRYPTO_ANSI_CPRNG=m |
558 | CONFIG_CRYPTO_DRBG_MENU=m | ||
559 | CONFIG_CRYPTO_DRBG_HASH=y | 565 | CONFIG_CRYPTO_DRBG_HASH=y |
560 | CONFIG_CRYPTO_DRBG_CTR=y | 566 | CONFIG_CRYPTO_DRBG_CTR=y |
561 | CONFIG_CRYPTO_USER_API_HASH=m | 567 | CONFIG_CRYPTO_USER_API_HASH=m |
562 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 568 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
563 | CONFIG_CRYPTO_USER_API_RNG=m | 569 | CONFIG_CRYPTO_USER_API_RNG=m |
570 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
564 | # CONFIG_CRYPTO_HW is not set | 571 | # CONFIG_CRYPTO_HW is not set |
565 | CONFIG_XZ_DEC_TEST=m | 572 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index c67248174e56..8afca3753db1 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -64,7 +64,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
64 | CONFIG_NET_IPGRE=m | 64 | CONFIG_NET_IPGRE=m |
65 | CONFIG_NET_IPVTI=m | 65 | CONFIG_NET_IPVTI=m |
66 | CONFIG_NET_FOU_IP_TUNNELS=y | 66 | CONFIG_NET_FOU_IP_TUNNELS=y |
67 | CONFIG_GENEVE=m | 67 | CONFIG_GENEVE_CORE=m |
68 | CONFIG_INET_AH=m | 68 | CONFIG_INET_AH=m |
69 | CONFIG_INET_ESP=m | 69 | CONFIG_INET_ESP=m |
70 | CONFIG_INET_IPCOMP=m | 70 | CONFIG_INET_IPCOMP=m |
@@ -98,6 +98,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
98 | CONFIG_NF_CONNTRACK_TFTP=m | 98 | CONFIG_NF_CONNTRACK_TFTP=m |
99 | CONFIG_NF_TABLES=m | 99 | CONFIG_NF_TABLES=m |
100 | CONFIG_NF_TABLES_INET=m | 100 | CONFIG_NF_TABLES_INET=m |
101 | CONFIG_NF_TABLES_NETDEV=m | ||
101 | CONFIG_NFT_EXTHDR=m | 102 | CONFIG_NFT_EXTHDR=m |
102 | CONFIG_NFT_META=m | 103 | CONFIG_NFT_META=m |
103 | CONFIG_NFT_CT=m | 104 | CONFIG_NFT_CT=m |
@@ -301,7 +302,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
301 | CONFIG_BLK_DEV_DRBD=m | 302 | CONFIG_BLK_DEV_DRBD=m |
302 | CONFIG_BLK_DEV_NBD=m | 303 | CONFIG_BLK_DEV_NBD=m |
303 | CONFIG_BLK_DEV_RAM=y | 304 | CONFIG_BLK_DEV_RAM=y |
304 | CONFIG_BLK_DEV_PMEM=m | ||
305 | CONFIG_CDROM_PKTCDVD=m | 305 | CONFIG_CDROM_PKTCDVD=m |
306 | CONFIG_ATA_OVER_ETH=m | 306 | CONFIG_ATA_OVER_ETH=m |
307 | CONFIG_DUMMY_IRQ=m | 307 | CONFIG_DUMMY_IRQ=m |
@@ -375,6 +375,7 @@ CONFIG_MACVLAN=m | |||
375 | CONFIG_MACVTAP=m | 375 | CONFIG_MACVTAP=m |
376 | CONFIG_IPVLAN=m | 376 | CONFIG_IPVLAN=m |
377 | CONFIG_VXLAN=m | 377 | CONFIG_VXLAN=m |
378 | CONFIG_GENEVE=m | ||
378 | CONFIG_NETCONSOLE=m | 379 | CONFIG_NETCONSOLE=m |
379 | CONFIG_NETCONSOLE_DYNAMIC=y | 380 | CONFIG_NETCONSOLE_DYNAMIC=y |
380 | CONFIG_VETH=m | 381 | CONFIG_VETH=m |
@@ -390,6 +391,7 @@ CONFIG_MACMACE=y | |||
390 | # CONFIG_NET_CADENCE is not set | 391 | # CONFIG_NET_CADENCE is not set |
391 | # CONFIG_NET_VENDOR_BROADCOM is not set | 392 | # CONFIG_NET_VENDOR_BROADCOM is not set |
392 | CONFIG_MAC89x0=y | 393 | CONFIG_MAC89x0=y |
394 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
393 | # CONFIG_NET_VENDOR_HP is not set | 395 | # CONFIG_NET_VENDOR_HP is not set |
394 | CONFIG_BVME6000_NET=y | 396 | CONFIG_BVME6000_NET=y |
395 | CONFIG_MVME16x_NET=y | 397 | CONFIG_MVME16x_NET=y |
@@ -402,6 +404,7 @@ CONFIG_NE2000=y | |||
402 | CONFIG_APNE=y | 404 | CONFIG_APNE=y |
403 | CONFIG_ZORRO8390=y | 405 | CONFIG_ZORRO8390=y |
404 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 406 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
407 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
405 | # CONFIG_NET_VENDOR_ROCKER is not set | 408 | # CONFIG_NET_VENDOR_ROCKER is not set |
406 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 409 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
407 | # CONFIG_NET_VENDOR_SEEQ is not set | 410 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -509,6 +512,7 @@ CONFIG_UDF_FS=m | |||
509 | CONFIG_MSDOS_FS=m | 512 | CONFIG_MSDOS_FS=m |
510 | CONFIG_VFAT_FS=m | 513 | CONFIG_VFAT_FS=m |
511 | CONFIG_PROC_KCORE=y | 514 | CONFIG_PROC_KCORE=y |
515 | CONFIG_PROC_CHILDREN=y | ||
512 | CONFIG_TMPFS=y | 516 | CONFIG_TMPFS=y |
513 | CONFIG_AFFS_FS=m | 517 | CONFIG_AFFS_FS=m |
514 | CONFIG_ECRYPT_FS=m | 518 | CONFIG_ECRYPT_FS=m |
@@ -597,6 +601,7 @@ CONFIG_TEST_FIRMWARE=m | |||
597 | CONFIG_TEST_UDELAY=m | 601 | CONFIG_TEST_UDELAY=m |
598 | CONFIG_EARLY_PRINTK=y | 602 | CONFIG_EARLY_PRINTK=y |
599 | CONFIG_ENCRYPTED_KEYS=m | 603 | CONFIG_ENCRYPTED_KEYS=m |
604 | CONFIG_CRYPTO_RSA=m | ||
600 | CONFIG_CRYPTO_MANAGER=y | 605 | CONFIG_CRYPTO_MANAGER=y |
601 | CONFIG_CRYPTO_USER=m | 606 | CONFIG_CRYPTO_USER=m |
602 | CONFIG_CRYPTO_CRYPTD=m | 607 | CONFIG_CRYPTO_CRYPTD=m |
@@ -604,6 +609,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
604 | CONFIG_CRYPTO_TEST=m | 609 | CONFIG_CRYPTO_TEST=m |
605 | CONFIG_CRYPTO_CCM=m | 610 | CONFIG_CRYPTO_CCM=m |
606 | CONFIG_CRYPTO_GCM=m | 611 | CONFIG_CRYPTO_GCM=m |
612 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
607 | CONFIG_CRYPTO_CTS=m | 613 | CONFIG_CRYPTO_CTS=m |
608 | CONFIG_CRYPTO_LRW=m | 614 | CONFIG_CRYPTO_LRW=m |
609 | CONFIG_CRYPTO_PCBC=m | 615 | CONFIG_CRYPTO_PCBC=m |
@@ -632,14 +638,15 @@ CONFIG_CRYPTO_TEA=m | |||
632 | CONFIG_CRYPTO_TWOFISH=m | 638 | CONFIG_CRYPTO_TWOFISH=m |
633 | CONFIG_CRYPTO_ZLIB=m | 639 | CONFIG_CRYPTO_ZLIB=m |
634 | CONFIG_CRYPTO_LZO=m | 640 | CONFIG_CRYPTO_LZO=m |
641 | CONFIG_CRYPTO_842=m | ||
635 | CONFIG_CRYPTO_LZ4=m | 642 | CONFIG_CRYPTO_LZ4=m |
636 | CONFIG_CRYPTO_LZ4HC=m | 643 | CONFIG_CRYPTO_LZ4HC=m |
637 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 644 | CONFIG_CRYPTO_ANSI_CPRNG=m |
638 | CONFIG_CRYPTO_DRBG_MENU=m | ||
639 | CONFIG_CRYPTO_DRBG_HASH=y | 645 | CONFIG_CRYPTO_DRBG_HASH=y |
640 | CONFIG_CRYPTO_DRBG_CTR=y | 646 | CONFIG_CRYPTO_DRBG_CTR=y |
641 | CONFIG_CRYPTO_USER_API_HASH=m | 647 | CONFIG_CRYPTO_USER_API_HASH=m |
642 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 648 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
643 | CONFIG_CRYPTO_USER_API_RNG=m | 649 | CONFIG_CRYPTO_USER_API_RNG=m |
650 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
644 | # CONFIG_CRYPTO_HW is not set | 651 | # CONFIG_CRYPTO_HW is not set |
645 | CONFIG_XZ_DEC_TEST=m | 652 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index fcc7f4488d43..ef00875994d9 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -52,7 +52,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
52 | CONFIG_NET_IPGRE=m | 52 | CONFIG_NET_IPGRE=m |
53 | CONFIG_NET_IPVTI=m | 53 | CONFIG_NET_IPVTI=m |
54 | CONFIG_NET_FOU_IP_TUNNELS=y | 54 | CONFIG_NET_FOU_IP_TUNNELS=y |
55 | CONFIG_GENEVE=m | 55 | CONFIG_GENEVE_CORE=m |
56 | CONFIG_INET_AH=m | 56 | CONFIG_INET_AH=m |
57 | CONFIG_INET_ESP=m | 57 | CONFIG_INET_ESP=m |
58 | CONFIG_INET_IPCOMP=m | 58 | CONFIG_INET_IPCOMP=m |
@@ -86,6 +86,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
86 | CONFIG_NF_CONNTRACK_TFTP=m | 86 | CONFIG_NF_CONNTRACK_TFTP=m |
87 | CONFIG_NF_TABLES=m | 87 | CONFIG_NF_TABLES=m |
88 | CONFIG_NF_TABLES_INET=m | 88 | CONFIG_NF_TABLES_INET=m |
89 | CONFIG_NF_TABLES_NETDEV=m | ||
89 | CONFIG_NFT_EXTHDR=m | 90 | CONFIG_NFT_EXTHDR=m |
90 | CONFIG_NFT_META=m | 91 | CONFIG_NFT_META=m |
91 | CONFIG_NFT_CT=m | 92 | CONFIG_NFT_CT=m |
@@ -276,7 +277,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
276 | CONFIG_BLK_DEV_DRBD=m | 277 | CONFIG_BLK_DEV_DRBD=m |
277 | CONFIG_BLK_DEV_NBD=m | 278 | CONFIG_BLK_DEV_NBD=m |
278 | CONFIG_BLK_DEV_RAM=y | 279 | CONFIG_BLK_DEV_RAM=y |
279 | CONFIG_BLK_DEV_PMEM=m | ||
280 | CONFIG_CDROM_PKTCDVD=m | 280 | CONFIG_CDROM_PKTCDVD=m |
281 | CONFIG_ATA_OVER_ETH=m | 281 | CONFIG_ATA_OVER_ETH=m |
282 | CONFIG_DUMMY_IRQ=m | 282 | CONFIG_DUMMY_IRQ=m |
@@ -324,6 +324,7 @@ CONFIG_MACVLAN=m | |||
324 | CONFIG_MACVTAP=m | 324 | CONFIG_MACVTAP=m |
325 | CONFIG_IPVLAN=m | 325 | CONFIG_IPVLAN=m |
326 | CONFIG_VXLAN=m | 326 | CONFIG_VXLAN=m |
327 | CONFIG_GENEVE=m | ||
327 | CONFIG_NETCONSOLE=m | 328 | CONFIG_NETCONSOLE=m |
328 | CONFIG_NETCONSOLE_DYNAMIC=y | 329 | CONFIG_NETCONSOLE_DYNAMIC=y |
329 | CONFIG_VETH=m | 330 | CONFIG_VETH=m |
@@ -331,11 +332,13 @@ CONFIG_MVME147_NET=y | |||
331 | # CONFIG_NET_VENDOR_ARC is not set | 332 | # CONFIG_NET_VENDOR_ARC is not set |
332 | # CONFIG_NET_CADENCE is not set | 333 | # CONFIG_NET_CADENCE is not set |
333 | # CONFIG_NET_VENDOR_BROADCOM is not set | 334 | # CONFIG_NET_VENDOR_BROADCOM is not set |
335 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
334 | # CONFIG_NET_VENDOR_INTEL is not set | 336 | # CONFIG_NET_VENDOR_INTEL is not set |
335 | # CONFIG_NET_VENDOR_MARVELL is not set | 337 | # CONFIG_NET_VENDOR_MARVELL is not set |
336 | # CONFIG_NET_VENDOR_MICREL is not set | 338 | # CONFIG_NET_VENDOR_MICREL is not set |
337 | # CONFIG_NET_VENDOR_NATSEMI is not set | 339 | # CONFIG_NET_VENDOR_NATSEMI is not set |
338 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 340 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
341 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
339 | # CONFIG_NET_VENDOR_ROCKER is not set | 342 | # CONFIG_NET_VENDOR_ROCKER is not set |
340 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 343 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
341 | # CONFIG_NET_VENDOR_SEEQ is not set | 344 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m | |||
398 | CONFIG_MSDOS_FS=m | 401 | CONFIG_MSDOS_FS=m |
399 | CONFIG_VFAT_FS=m | 402 | CONFIG_VFAT_FS=m |
400 | CONFIG_PROC_KCORE=y | 403 | CONFIG_PROC_KCORE=y |
404 | CONFIG_PROC_CHILDREN=y | ||
401 | CONFIG_TMPFS=y | 405 | CONFIG_TMPFS=y |
402 | CONFIG_AFFS_FS=m | 406 | CONFIG_AFFS_FS=m |
403 | CONFIG_ECRYPT_FS=m | 407 | CONFIG_ECRYPT_FS=m |
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m | |||
486 | CONFIG_TEST_UDELAY=m | 490 | CONFIG_TEST_UDELAY=m |
487 | CONFIG_EARLY_PRINTK=y | 491 | CONFIG_EARLY_PRINTK=y |
488 | CONFIG_ENCRYPTED_KEYS=m | 492 | CONFIG_ENCRYPTED_KEYS=m |
493 | CONFIG_CRYPTO_RSA=m | ||
489 | CONFIG_CRYPTO_MANAGER=y | 494 | CONFIG_CRYPTO_MANAGER=y |
490 | CONFIG_CRYPTO_USER=m | 495 | CONFIG_CRYPTO_USER=m |
491 | CONFIG_CRYPTO_CRYPTD=m | 496 | CONFIG_CRYPTO_CRYPTD=m |
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
493 | CONFIG_CRYPTO_TEST=m | 498 | CONFIG_CRYPTO_TEST=m |
494 | CONFIG_CRYPTO_CCM=m | 499 | CONFIG_CRYPTO_CCM=m |
495 | CONFIG_CRYPTO_GCM=m | 500 | CONFIG_CRYPTO_GCM=m |
501 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
496 | CONFIG_CRYPTO_CTS=m | 502 | CONFIG_CRYPTO_CTS=m |
497 | CONFIG_CRYPTO_LRW=m | 503 | CONFIG_CRYPTO_LRW=m |
498 | CONFIG_CRYPTO_PCBC=m | 504 | CONFIG_CRYPTO_PCBC=m |
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m | |||
521 | CONFIG_CRYPTO_TWOFISH=m | 527 | CONFIG_CRYPTO_TWOFISH=m |
522 | CONFIG_CRYPTO_ZLIB=m | 528 | CONFIG_CRYPTO_ZLIB=m |
523 | CONFIG_CRYPTO_LZO=m | 529 | CONFIG_CRYPTO_LZO=m |
530 | CONFIG_CRYPTO_842=m | ||
524 | CONFIG_CRYPTO_LZ4=m | 531 | CONFIG_CRYPTO_LZ4=m |
525 | CONFIG_CRYPTO_LZ4HC=m | 532 | CONFIG_CRYPTO_LZ4HC=m |
526 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 533 | CONFIG_CRYPTO_ANSI_CPRNG=m |
527 | CONFIG_CRYPTO_DRBG_MENU=m | ||
528 | CONFIG_CRYPTO_DRBG_HASH=y | 534 | CONFIG_CRYPTO_DRBG_HASH=y |
529 | CONFIG_CRYPTO_DRBG_CTR=y | 535 | CONFIG_CRYPTO_DRBG_CTR=y |
530 | CONFIG_CRYPTO_USER_API_HASH=m | 536 | CONFIG_CRYPTO_USER_API_HASH=m |
531 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 537 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
532 | CONFIG_CRYPTO_USER_API_RNG=m | 538 | CONFIG_CRYPTO_USER_API_RNG=m |
539 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
533 | # CONFIG_CRYPTO_HW is not set | 540 | # CONFIG_CRYPTO_HW is not set |
534 | CONFIG_XZ_DEC_TEST=m | 541 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index 474429471e21..387c2bd90ff1 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
53 | CONFIG_NET_IPGRE=m | 53 | CONFIG_NET_IPGRE=m |
54 | CONFIG_NET_IPVTI=m | 54 | CONFIG_NET_IPVTI=m |
55 | CONFIG_NET_FOU_IP_TUNNELS=y | 55 | CONFIG_NET_FOU_IP_TUNNELS=y |
56 | CONFIG_GENEVE=m | 56 | CONFIG_GENEVE_CORE=m |
57 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
58 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
59 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
87 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
88 | CONFIG_NF_TABLES=m | 88 | CONFIG_NF_TABLES=m |
89 | CONFIG_NF_TABLES_INET=m | 89 | CONFIG_NF_TABLES_INET=m |
90 | CONFIG_NF_TABLES_NETDEV=m | ||
90 | CONFIG_NFT_EXTHDR=m | 91 | CONFIG_NFT_EXTHDR=m |
91 | CONFIG_NFT_META=m | 92 | CONFIG_NFT_META=m |
92 | CONFIG_NFT_CT=m | 93 | CONFIG_NFT_CT=m |
@@ -277,7 +278,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
277 | CONFIG_BLK_DEV_DRBD=m | 278 | CONFIG_BLK_DEV_DRBD=m |
278 | CONFIG_BLK_DEV_NBD=m | 279 | CONFIG_BLK_DEV_NBD=m |
279 | CONFIG_BLK_DEV_RAM=y | 280 | CONFIG_BLK_DEV_RAM=y |
280 | CONFIG_BLK_DEV_PMEM=m | ||
281 | CONFIG_CDROM_PKTCDVD=m | 281 | CONFIG_CDROM_PKTCDVD=m |
282 | CONFIG_ATA_OVER_ETH=m | 282 | CONFIG_ATA_OVER_ETH=m |
283 | CONFIG_DUMMY_IRQ=m | 283 | CONFIG_DUMMY_IRQ=m |
@@ -325,17 +325,20 @@ CONFIG_MACVLAN=m | |||
325 | CONFIG_MACVTAP=m | 325 | CONFIG_MACVTAP=m |
326 | CONFIG_IPVLAN=m | 326 | CONFIG_IPVLAN=m |
327 | CONFIG_VXLAN=m | 327 | CONFIG_VXLAN=m |
328 | CONFIG_GENEVE=m | ||
328 | CONFIG_NETCONSOLE=m | 329 | CONFIG_NETCONSOLE=m |
329 | CONFIG_NETCONSOLE_DYNAMIC=y | 330 | CONFIG_NETCONSOLE_DYNAMIC=y |
330 | CONFIG_VETH=m | 331 | CONFIG_VETH=m |
331 | # CONFIG_NET_VENDOR_ARC is not set | 332 | # CONFIG_NET_VENDOR_ARC is not set |
332 | # CONFIG_NET_CADENCE is not set | 333 | # CONFIG_NET_CADENCE is not set |
333 | # CONFIG_NET_VENDOR_BROADCOM is not set | 334 | # CONFIG_NET_VENDOR_BROADCOM is not set |
335 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
334 | CONFIG_MVME16x_NET=y | 336 | CONFIG_MVME16x_NET=y |
335 | # CONFIG_NET_VENDOR_MARVELL is not set | 337 | # CONFIG_NET_VENDOR_MARVELL is not set |
336 | # CONFIG_NET_VENDOR_MICREL is not set | 338 | # CONFIG_NET_VENDOR_MICREL is not set |
337 | # CONFIG_NET_VENDOR_NATSEMI is not set | 339 | # CONFIG_NET_VENDOR_NATSEMI is not set |
338 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 340 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
341 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
339 | # CONFIG_NET_VENDOR_ROCKER is not set | 342 | # CONFIG_NET_VENDOR_ROCKER is not set |
340 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 343 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
341 | # CONFIG_NET_VENDOR_SEEQ is not set | 344 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -398,6 +401,7 @@ CONFIG_UDF_FS=m | |||
398 | CONFIG_MSDOS_FS=m | 401 | CONFIG_MSDOS_FS=m |
399 | CONFIG_VFAT_FS=m | 402 | CONFIG_VFAT_FS=m |
400 | CONFIG_PROC_KCORE=y | 403 | CONFIG_PROC_KCORE=y |
404 | CONFIG_PROC_CHILDREN=y | ||
401 | CONFIG_TMPFS=y | 405 | CONFIG_TMPFS=y |
402 | CONFIG_AFFS_FS=m | 406 | CONFIG_AFFS_FS=m |
403 | CONFIG_ECRYPT_FS=m | 407 | CONFIG_ECRYPT_FS=m |
@@ -486,6 +490,7 @@ CONFIG_TEST_FIRMWARE=m | |||
486 | CONFIG_TEST_UDELAY=m | 490 | CONFIG_TEST_UDELAY=m |
487 | CONFIG_EARLY_PRINTK=y | 491 | CONFIG_EARLY_PRINTK=y |
488 | CONFIG_ENCRYPTED_KEYS=m | 492 | CONFIG_ENCRYPTED_KEYS=m |
493 | CONFIG_CRYPTO_RSA=m | ||
489 | CONFIG_CRYPTO_MANAGER=y | 494 | CONFIG_CRYPTO_MANAGER=y |
490 | CONFIG_CRYPTO_USER=m | 495 | CONFIG_CRYPTO_USER=m |
491 | CONFIG_CRYPTO_CRYPTD=m | 496 | CONFIG_CRYPTO_CRYPTD=m |
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
493 | CONFIG_CRYPTO_TEST=m | 498 | CONFIG_CRYPTO_TEST=m |
494 | CONFIG_CRYPTO_CCM=m | 499 | CONFIG_CRYPTO_CCM=m |
495 | CONFIG_CRYPTO_GCM=m | 500 | CONFIG_CRYPTO_GCM=m |
501 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
496 | CONFIG_CRYPTO_CTS=m | 502 | CONFIG_CRYPTO_CTS=m |
497 | CONFIG_CRYPTO_LRW=m | 503 | CONFIG_CRYPTO_LRW=m |
498 | CONFIG_CRYPTO_PCBC=m | 504 | CONFIG_CRYPTO_PCBC=m |
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m | |||
521 | CONFIG_CRYPTO_TWOFISH=m | 527 | CONFIG_CRYPTO_TWOFISH=m |
522 | CONFIG_CRYPTO_ZLIB=m | 528 | CONFIG_CRYPTO_ZLIB=m |
523 | CONFIG_CRYPTO_LZO=m | 529 | CONFIG_CRYPTO_LZO=m |
530 | CONFIG_CRYPTO_842=m | ||
524 | CONFIG_CRYPTO_LZ4=m | 531 | CONFIG_CRYPTO_LZ4=m |
525 | CONFIG_CRYPTO_LZ4HC=m | 532 | CONFIG_CRYPTO_LZ4HC=m |
526 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 533 | CONFIG_CRYPTO_ANSI_CPRNG=m |
527 | CONFIG_CRYPTO_DRBG_MENU=m | ||
528 | CONFIG_CRYPTO_DRBG_HASH=y | 534 | CONFIG_CRYPTO_DRBG_HASH=y |
529 | CONFIG_CRYPTO_DRBG_CTR=y | 535 | CONFIG_CRYPTO_DRBG_CTR=y |
530 | CONFIG_CRYPTO_USER_API_HASH=m | 536 | CONFIG_CRYPTO_USER_API_HASH=m |
531 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 537 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
532 | CONFIG_CRYPTO_USER_API_RNG=m | 538 | CONFIG_CRYPTO_USER_API_RNG=m |
539 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
533 | # CONFIG_CRYPTO_HW is not set | 540 | # CONFIG_CRYPTO_HW is not set |
534 | CONFIG_XZ_DEC_TEST=m | 541 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 9e4d382161fa..35355c1bc714 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -53,7 +53,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
53 | CONFIG_NET_IPGRE=m | 53 | CONFIG_NET_IPGRE=m |
54 | CONFIG_NET_IPVTI=m | 54 | CONFIG_NET_IPVTI=m |
55 | CONFIG_NET_FOU_IP_TUNNELS=y | 55 | CONFIG_NET_FOU_IP_TUNNELS=y |
56 | CONFIG_GENEVE=m | 56 | CONFIG_GENEVE_CORE=m |
57 | CONFIG_INET_AH=m | 57 | CONFIG_INET_AH=m |
58 | CONFIG_INET_ESP=m | 58 | CONFIG_INET_ESP=m |
59 | CONFIG_INET_IPCOMP=m | 59 | CONFIG_INET_IPCOMP=m |
@@ -87,6 +87,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
87 | CONFIG_NF_CONNTRACK_TFTP=m | 87 | CONFIG_NF_CONNTRACK_TFTP=m |
88 | CONFIG_NF_TABLES=m | 88 | CONFIG_NF_TABLES=m |
89 | CONFIG_NF_TABLES_INET=m | 89 | CONFIG_NF_TABLES_INET=m |
90 | CONFIG_NF_TABLES_NETDEV=m | ||
90 | CONFIG_NFT_EXTHDR=m | 91 | CONFIG_NFT_EXTHDR=m |
91 | CONFIG_NFT_META=m | 92 | CONFIG_NFT_META=m |
92 | CONFIG_NFT_CT=m | 93 | CONFIG_NFT_CT=m |
@@ -280,7 +281,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
280 | CONFIG_BLK_DEV_DRBD=m | 281 | CONFIG_BLK_DEV_DRBD=m |
281 | CONFIG_BLK_DEV_NBD=m | 282 | CONFIG_BLK_DEV_NBD=m |
282 | CONFIG_BLK_DEV_RAM=y | 283 | CONFIG_BLK_DEV_RAM=y |
283 | CONFIG_BLK_DEV_PMEM=m | ||
284 | CONFIG_CDROM_PKTCDVD=m | 284 | CONFIG_CDROM_PKTCDVD=m |
285 | CONFIG_ATA_OVER_ETH=m | 285 | CONFIG_ATA_OVER_ETH=m |
286 | CONFIG_DUMMY_IRQ=m | 286 | CONFIG_DUMMY_IRQ=m |
@@ -331,6 +331,7 @@ CONFIG_MACVLAN=m | |||
331 | CONFIG_MACVTAP=m | 331 | CONFIG_MACVTAP=m |
332 | CONFIG_IPVLAN=m | 332 | CONFIG_IPVLAN=m |
333 | CONFIG_VXLAN=m | 333 | CONFIG_VXLAN=m |
334 | CONFIG_GENEVE=m | ||
334 | CONFIG_NETCONSOLE=m | 335 | CONFIG_NETCONSOLE=m |
335 | CONFIG_NETCONSOLE_DYNAMIC=y | 336 | CONFIG_NETCONSOLE_DYNAMIC=y |
336 | CONFIG_VETH=m | 337 | CONFIG_VETH=m |
@@ -340,12 +341,14 @@ CONFIG_VETH=m | |||
340 | # CONFIG_NET_CADENCE is not set | 341 | # CONFIG_NET_CADENCE is not set |
341 | # CONFIG_NET_VENDOR_BROADCOM is not set | 342 | # CONFIG_NET_VENDOR_BROADCOM is not set |
342 | # CONFIG_NET_VENDOR_CIRRUS is not set | 343 | # CONFIG_NET_VENDOR_CIRRUS is not set |
344 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
343 | # CONFIG_NET_VENDOR_HP is not set | 345 | # CONFIG_NET_VENDOR_HP is not set |
344 | # CONFIG_NET_VENDOR_INTEL is not set | 346 | # CONFIG_NET_VENDOR_INTEL is not set |
345 | # CONFIG_NET_VENDOR_MARVELL is not set | 347 | # CONFIG_NET_VENDOR_MARVELL is not set |
346 | # CONFIG_NET_VENDOR_MICREL is not set | 348 | # CONFIG_NET_VENDOR_MICREL is not set |
347 | CONFIG_NE2000=y | 349 | CONFIG_NE2000=y |
348 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 350 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
351 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
349 | # CONFIG_NET_VENDOR_ROCKER is not set | 352 | # CONFIG_NET_VENDOR_ROCKER is not set |
350 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 353 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
351 | # CONFIG_NET_VENDOR_SEEQ is not set | 354 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -420,6 +423,7 @@ CONFIG_UDF_FS=m | |||
420 | CONFIG_MSDOS_FS=m | 423 | CONFIG_MSDOS_FS=m |
421 | CONFIG_VFAT_FS=m | 424 | CONFIG_VFAT_FS=m |
422 | CONFIG_PROC_KCORE=y | 425 | CONFIG_PROC_KCORE=y |
426 | CONFIG_PROC_CHILDREN=y | ||
423 | CONFIG_TMPFS=y | 427 | CONFIG_TMPFS=y |
424 | CONFIG_AFFS_FS=m | 428 | CONFIG_AFFS_FS=m |
425 | CONFIG_ECRYPT_FS=m | 429 | CONFIG_ECRYPT_FS=m |
@@ -508,6 +512,7 @@ CONFIG_TEST_FIRMWARE=m | |||
508 | CONFIG_TEST_UDELAY=m | 512 | CONFIG_TEST_UDELAY=m |
509 | CONFIG_EARLY_PRINTK=y | 513 | CONFIG_EARLY_PRINTK=y |
510 | CONFIG_ENCRYPTED_KEYS=m | 514 | CONFIG_ENCRYPTED_KEYS=m |
515 | CONFIG_CRYPTO_RSA=m | ||
511 | CONFIG_CRYPTO_MANAGER=y | 516 | CONFIG_CRYPTO_MANAGER=y |
512 | CONFIG_CRYPTO_USER=m | 517 | CONFIG_CRYPTO_USER=m |
513 | CONFIG_CRYPTO_CRYPTD=m | 518 | CONFIG_CRYPTO_CRYPTD=m |
@@ -515,6 +520,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
515 | CONFIG_CRYPTO_TEST=m | 520 | CONFIG_CRYPTO_TEST=m |
516 | CONFIG_CRYPTO_CCM=m | 521 | CONFIG_CRYPTO_CCM=m |
517 | CONFIG_CRYPTO_GCM=m | 522 | CONFIG_CRYPTO_GCM=m |
523 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
518 | CONFIG_CRYPTO_CTS=m | 524 | CONFIG_CRYPTO_CTS=m |
519 | CONFIG_CRYPTO_LRW=m | 525 | CONFIG_CRYPTO_LRW=m |
520 | CONFIG_CRYPTO_PCBC=m | 526 | CONFIG_CRYPTO_PCBC=m |
@@ -543,14 +549,15 @@ CONFIG_CRYPTO_TEA=m | |||
543 | CONFIG_CRYPTO_TWOFISH=m | 549 | CONFIG_CRYPTO_TWOFISH=m |
544 | CONFIG_CRYPTO_ZLIB=m | 550 | CONFIG_CRYPTO_ZLIB=m |
545 | CONFIG_CRYPTO_LZO=m | 551 | CONFIG_CRYPTO_LZO=m |
552 | CONFIG_CRYPTO_842=m | ||
546 | CONFIG_CRYPTO_LZ4=m | 553 | CONFIG_CRYPTO_LZ4=m |
547 | CONFIG_CRYPTO_LZ4HC=m | 554 | CONFIG_CRYPTO_LZ4HC=m |
548 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 555 | CONFIG_CRYPTO_ANSI_CPRNG=m |
549 | CONFIG_CRYPTO_DRBG_MENU=m | ||
550 | CONFIG_CRYPTO_DRBG_HASH=y | 556 | CONFIG_CRYPTO_DRBG_HASH=y |
551 | CONFIG_CRYPTO_DRBG_CTR=y | 557 | CONFIG_CRYPTO_DRBG_CTR=y |
552 | CONFIG_CRYPTO_USER_API_HASH=m | 558 | CONFIG_CRYPTO_USER_API_HASH=m |
553 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 559 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
554 | CONFIG_CRYPTO_USER_API_RNG=m | 560 | CONFIG_CRYPTO_USER_API_RNG=m |
561 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
555 | # CONFIG_CRYPTO_HW is not set | 562 | # CONFIG_CRYPTO_HW is not set |
556 | CONFIG_XZ_DEC_TEST=m | 563 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index e55d15f8cded..8442d267b877 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
50 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
51 | CONFIG_NET_IPVTI=m | 51 | CONFIG_NET_IPVTI=m |
52 | CONFIG_NET_FOU_IP_TUNNELS=y | 52 | CONFIG_NET_FOU_IP_TUNNELS=y |
53 | CONFIG_GENEVE=m | 53 | CONFIG_GENEVE_CORE=m |
54 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
55 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
56 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
84 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NF_TABLES=m | 85 | CONFIG_NF_TABLES=m |
86 | CONFIG_NF_TABLES_INET=m | 86 | CONFIG_NF_TABLES_INET=m |
87 | CONFIG_NF_TABLES_NETDEV=m | ||
87 | CONFIG_NFT_EXTHDR=m | 88 | CONFIG_NFT_EXTHDR=m |
88 | CONFIG_NFT_META=m | 89 | CONFIG_NFT_META=m |
89 | CONFIG_NFT_CT=m | 90 | CONFIG_NFT_CT=m |
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
274 | CONFIG_BLK_DEV_DRBD=m | 275 | CONFIG_BLK_DEV_DRBD=m |
275 | CONFIG_BLK_DEV_NBD=m | 276 | CONFIG_BLK_DEV_NBD=m |
276 | CONFIG_BLK_DEV_RAM=y | 277 | CONFIG_BLK_DEV_RAM=y |
277 | CONFIG_BLK_DEV_PMEM=m | ||
278 | CONFIG_CDROM_PKTCDVD=m | 278 | CONFIG_CDROM_PKTCDVD=m |
279 | CONFIG_ATA_OVER_ETH=m | 279 | CONFIG_ATA_OVER_ETH=m |
280 | CONFIG_DUMMY_IRQ=m | 280 | CONFIG_DUMMY_IRQ=m |
@@ -322,17 +322,20 @@ CONFIG_MACVLAN=m | |||
322 | CONFIG_MACVTAP=m | 322 | CONFIG_MACVTAP=m |
323 | CONFIG_IPVLAN=m | 323 | CONFIG_IPVLAN=m |
324 | CONFIG_VXLAN=m | 324 | CONFIG_VXLAN=m |
325 | CONFIG_GENEVE=m | ||
325 | CONFIG_NETCONSOLE=m | 326 | CONFIG_NETCONSOLE=m |
326 | CONFIG_NETCONSOLE_DYNAMIC=y | 327 | CONFIG_NETCONSOLE_DYNAMIC=y |
327 | CONFIG_VETH=m | 328 | CONFIG_VETH=m |
328 | CONFIG_SUN3LANCE=y | 329 | CONFIG_SUN3LANCE=y |
329 | # CONFIG_NET_VENDOR_ARC is not set | 330 | # CONFIG_NET_VENDOR_ARC is not set |
330 | # CONFIG_NET_CADENCE is not set | 331 | # CONFIG_NET_CADENCE is not set |
332 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
331 | CONFIG_SUN3_82586=y | 333 | CONFIG_SUN3_82586=y |
332 | # CONFIG_NET_VENDOR_MARVELL is not set | 334 | # CONFIG_NET_VENDOR_MARVELL is not set |
333 | # CONFIG_NET_VENDOR_MICREL is not set | 335 | # CONFIG_NET_VENDOR_MICREL is not set |
334 | # CONFIG_NET_VENDOR_NATSEMI is not set | 336 | # CONFIG_NET_VENDOR_NATSEMI is not set |
335 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 337 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
338 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
336 | # CONFIG_NET_VENDOR_ROCKER is not set | 339 | # CONFIG_NET_VENDOR_ROCKER is not set |
337 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 340 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
338 | # CONFIG_NET_VENDOR_SEEQ is not set | 341 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -399,6 +402,7 @@ CONFIG_UDF_FS=m | |||
399 | CONFIG_MSDOS_FS=m | 402 | CONFIG_MSDOS_FS=m |
400 | CONFIG_VFAT_FS=m | 403 | CONFIG_VFAT_FS=m |
401 | CONFIG_PROC_KCORE=y | 404 | CONFIG_PROC_KCORE=y |
405 | CONFIG_PROC_CHILDREN=y | ||
402 | CONFIG_TMPFS=y | 406 | CONFIG_TMPFS=y |
403 | CONFIG_AFFS_FS=m | 407 | CONFIG_AFFS_FS=m |
404 | CONFIG_ECRYPT_FS=m | 408 | CONFIG_ECRYPT_FS=m |
@@ -486,6 +490,7 @@ CONFIG_TEST_BPF=m | |||
486 | CONFIG_TEST_FIRMWARE=m | 490 | CONFIG_TEST_FIRMWARE=m |
487 | CONFIG_TEST_UDELAY=m | 491 | CONFIG_TEST_UDELAY=m |
488 | CONFIG_ENCRYPTED_KEYS=m | 492 | CONFIG_ENCRYPTED_KEYS=m |
493 | CONFIG_CRYPTO_RSA=m | ||
489 | CONFIG_CRYPTO_MANAGER=y | 494 | CONFIG_CRYPTO_MANAGER=y |
490 | CONFIG_CRYPTO_USER=m | 495 | CONFIG_CRYPTO_USER=m |
491 | CONFIG_CRYPTO_CRYPTD=m | 496 | CONFIG_CRYPTO_CRYPTD=m |
@@ -493,6 +498,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
493 | CONFIG_CRYPTO_TEST=m | 498 | CONFIG_CRYPTO_TEST=m |
494 | CONFIG_CRYPTO_CCM=m | 499 | CONFIG_CRYPTO_CCM=m |
495 | CONFIG_CRYPTO_GCM=m | 500 | CONFIG_CRYPTO_GCM=m |
501 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
496 | CONFIG_CRYPTO_CTS=m | 502 | CONFIG_CRYPTO_CTS=m |
497 | CONFIG_CRYPTO_LRW=m | 503 | CONFIG_CRYPTO_LRW=m |
498 | CONFIG_CRYPTO_PCBC=m | 504 | CONFIG_CRYPTO_PCBC=m |
@@ -521,14 +527,15 @@ CONFIG_CRYPTO_TEA=m | |||
521 | CONFIG_CRYPTO_TWOFISH=m | 527 | CONFIG_CRYPTO_TWOFISH=m |
522 | CONFIG_CRYPTO_ZLIB=m | 528 | CONFIG_CRYPTO_ZLIB=m |
523 | CONFIG_CRYPTO_LZO=m | 529 | CONFIG_CRYPTO_LZO=m |
530 | CONFIG_CRYPTO_842=m | ||
524 | CONFIG_CRYPTO_LZ4=m | 531 | CONFIG_CRYPTO_LZ4=m |
525 | CONFIG_CRYPTO_LZ4HC=m | 532 | CONFIG_CRYPTO_LZ4HC=m |
526 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 533 | CONFIG_CRYPTO_ANSI_CPRNG=m |
527 | CONFIG_CRYPTO_DRBG_MENU=m | ||
528 | CONFIG_CRYPTO_DRBG_HASH=y | 534 | CONFIG_CRYPTO_DRBG_HASH=y |
529 | CONFIG_CRYPTO_DRBG_CTR=y | 535 | CONFIG_CRYPTO_DRBG_CTR=y |
530 | CONFIG_CRYPTO_USER_API_HASH=m | 536 | CONFIG_CRYPTO_USER_API_HASH=m |
531 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 537 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
532 | CONFIG_CRYPTO_USER_API_RNG=m | 538 | CONFIG_CRYPTO_USER_API_RNG=m |
539 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
533 | # CONFIG_CRYPTO_HW is not set | 540 | # CONFIG_CRYPTO_HW is not set |
534 | CONFIG_XZ_DEC_TEST=m | 541 | CONFIG_XZ_DEC_TEST=m |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 6f204857babd..0e1b542e1555 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -50,7 +50,7 @@ CONFIG_NET_IPGRE_DEMUX=m | |||
50 | CONFIG_NET_IPGRE=m | 50 | CONFIG_NET_IPGRE=m |
51 | CONFIG_NET_IPVTI=m | 51 | CONFIG_NET_IPVTI=m |
52 | CONFIG_NET_FOU_IP_TUNNELS=y | 52 | CONFIG_NET_FOU_IP_TUNNELS=y |
53 | CONFIG_GENEVE=m | 53 | CONFIG_GENEVE_CORE=m |
54 | CONFIG_INET_AH=m | 54 | CONFIG_INET_AH=m |
55 | CONFIG_INET_ESP=m | 55 | CONFIG_INET_ESP=m |
56 | CONFIG_INET_IPCOMP=m | 56 | CONFIG_INET_IPCOMP=m |
@@ -84,6 +84,7 @@ CONFIG_NF_CONNTRACK_SIP=m | |||
84 | CONFIG_NF_CONNTRACK_TFTP=m | 84 | CONFIG_NF_CONNTRACK_TFTP=m |
85 | CONFIG_NF_TABLES=m | 85 | CONFIG_NF_TABLES=m |
86 | CONFIG_NF_TABLES_INET=m | 86 | CONFIG_NF_TABLES_INET=m |
87 | CONFIG_NF_TABLES_NETDEV=m | ||
87 | CONFIG_NFT_EXTHDR=m | 88 | CONFIG_NFT_EXTHDR=m |
88 | CONFIG_NFT_META=m | 89 | CONFIG_NFT_META=m |
89 | CONFIG_NFT_CT=m | 90 | CONFIG_NFT_CT=m |
@@ -274,7 +275,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
274 | CONFIG_BLK_DEV_DRBD=m | 275 | CONFIG_BLK_DEV_DRBD=m |
275 | CONFIG_BLK_DEV_NBD=m | 276 | CONFIG_BLK_DEV_NBD=m |
276 | CONFIG_BLK_DEV_RAM=y | 277 | CONFIG_BLK_DEV_RAM=y |
277 | CONFIG_BLK_DEV_PMEM=m | ||
278 | CONFIG_CDROM_PKTCDVD=m | 278 | CONFIG_CDROM_PKTCDVD=m |
279 | CONFIG_ATA_OVER_ETH=m | 279 | CONFIG_ATA_OVER_ETH=m |
280 | CONFIG_DUMMY_IRQ=m | 280 | CONFIG_DUMMY_IRQ=m |
@@ -322,6 +322,7 @@ CONFIG_MACVLAN=m | |||
322 | CONFIG_MACVTAP=m | 322 | CONFIG_MACVTAP=m |
323 | CONFIG_IPVLAN=m | 323 | CONFIG_IPVLAN=m |
324 | CONFIG_VXLAN=m | 324 | CONFIG_VXLAN=m |
325 | CONFIG_GENEVE=m | ||
325 | CONFIG_NETCONSOLE=m | 326 | CONFIG_NETCONSOLE=m |
326 | CONFIG_NETCONSOLE_DYNAMIC=y | 327 | CONFIG_NETCONSOLE_DYNAMIC=y |
327 | CONFIG_VETH=m | 328 | CONFIG_VETH=m |
@@ -329,11 +330,13 @@ CONFIG_SUN3LANCE=y | |||
329 | # CONFIG_NET_VENDOR_ARC is not set | 330 | # CONFIG_NET_VENDOR_ARC is not set |
330 | # CONFIG_NET_CADENCE is not set | 331 | # CONFIG_NET_CADENCE is not set |
331 | # CONFIG_NET_VENDOR_BROADCOM is not set | 332 | # CONFIG_NET_VENDOR_BROADCOM is not set |
333 | # CONFIG_NET_VENDOR_EZCHIP is not set | ||
332 | # CONFIG_NET_VENDOR_INTEL is not set | 334 | # CONFIG_NET_VENDOR_INTEL is not set |
333 | # CONFIG_NET_VENDOR_MARVELL is not set | 335 | # CONFIG_NET_VENDOR_MARVELL is not set |
334 | # CONFIG_NET_VENDOR_MICREL is not set | 336 | # CONFIG_NET_VENDOR_MICREL is not set |
335 | # CONFIG_NET_VENDOR_NATSEMI is not set | 337 | # CONFIG_NET_VENDOR_NATSEMI is not set |
336 | # CONFIG_NET_VENDOR_QUALCOMM is not set | 338 | # CONFIG_NET_VENDOR_QUALCOMM is not set |
339 | # CONFIG_NET_VENDOR_RENESAS is not set | ||
337 | # CONFIG_NET_VENDOR_ROCKER is not set | 340 | # CONFIG_NET_VENDOR_ROCKER is not set |
338 | # CONFIG_NET_VENDOR_SAMSUNG is not set | 341 | # CONFIG_NET_VENDOR_SAMSUNG is not set |
339 | # CONFIG_NET_VENDOR_SEEQ is not set | 342 | # CONFIG_NET_VENDOR_SEEQ is not set |
@@ -399,6 +402,7 @@ CONFIG_UDF_FS=m | |||
399 | CONFIG_MSDOS_FS=m | 402 | CONFIG_MSDOS_FS=m |
400 | CONFIG_VFAT_FS=m | 403 | CONFIG_VFAT_FS=m |
401 | CONFIG_PROC_KCORE=y | 404 | CONFIG_PROC_KCORE=y |
405 | CONFIG_PROC_CHILDREN=y | ||
402 | CONFIG_TMPFS=y | 406 | CONFIG_TMPFS=y |
403 | CONFIG_AFFS_FS=m | 407 | CONFIG_AFFS_FS=m |
404 | CONFIG_ECRYPT_FS=m | 408 | CONFIG_ECRYPT_FS=m |
@@ -487,6 +491,7 @@ CONFIG_TEST_FIRMWARE=m | |||
487 | CONFIG_TEST_UDELAY=m | 491 | CONFIG_TEST_UDELAY=m |
488 | CONFIG_EARLY_PRINTK=y | 492 | CONFIG_EARLY_PRINTK=y |
489 | CONFIG_ENCRYPTED_KEYS=m | 493 | CONFIG_ENCRYPTED_KEYS=m |
494 | CONFIG_CRYPTO_RSA=m | ||
490 | CONFIG_CRYPTO_MANAGER=y | 495 | CONFIG_CRYPTO_MANAGER=y |
491 | CONFIG_CRYPTO_USER=m | 496 | CONFIG_CRYPTO_USER=m |
492 | CONFIG_CRYPTO_CRYPTD=m | 497 | CONFIG_CRYPTO_CRYPTD=m |
@@ -494,6 +499,7 @@ CONFIG_CRYPTO_MCRYPTD=m | |||
494 | CONFIG_CRYPTO_TEST=m | 499 | CONFIG_CRYPTO_TEST=m |
495 | CONFIG_CRYPTO_CCM=m | 500 | CONFIG_CRYPTO_CCM=m |
496 | CONFIG_CRYPTO_GCM=m | 501 | CONFIG_CRYPTO_GCM=m |
502 | CONFIG_CRYPTO_CHACHA20POLY1305=m | ||
497 | CONFIG_CRYPTO_CTS=m | 503 | CONFIG_CRYPTO_CTS=m |
498 | CONFIG_CRYPTO_LRW=m | 504 | CONFIG_CRYPTO_LRW=m |
499 | CONFIG_CRYPTO_PCBC=m | 505 | CONFIG_CRYPTO_PCBC=m |
@@ -522,14 +528,15 @@ CONFIG_CRYPTO_TEA=m | |||
522 | CONFIG_CRYPTO_TWOFISH=m | 528 | CONFIG_CRYPTO_TWOFISH=m |
523 | CONFIG_CRYPTO_ZLIB=m | 529 | CONFIG_CRYPTO_ZLIB=m |
524 | CONFIG_CRYPTO_LZO=m | 530 | CONFIG_CRYPTO_LZO=m |
531 | CONFIG_CRYPTO_842=m | ||
525 | CONFIG_CRYPTO_LZ4=m | 532 | CONFIG_CRYPTO_LZ4=m |
526 | CONFIG_CRYPTO_LZ4HC=m | 533 | CONFIG_CRYPTO_LZ4HC=m |
527 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 534 | CONFIG_CRYPTO_ANSI_CPRNG=m |
528 | CONFIG_CRYPTO_DRBG_MENU=m | ||
529 | CONFIG_CRYPTO_DRBG_HASH=y | 535 | CONFIG_CRYPTO_DRBG_HASH=y |
530 | CONFIG_CRYPTO_DRBG_CTR=y | 536 | CONFIG_CRYPTO_DRBG_CTR=y |
531 | CONFIG_CRYPTO_USER_API_HASH=m | 537 | CONFIG_CRYPTO_USER_API_HASH=m |
532 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | 538 | CONFIG_CRYPTO_USER_API_SKCIPHER=m |
533 | CONFIG_CRYPTO_USER_API_RNG=m | 539 | CONFIG_CRYPTO_USER_API_RNG=m |
540 | CONFIG_CRYPTO_USER_API_AEAD=m | ||
534 | # CONFIG_CRYPTO_HW is not set | 541 | # CONFIG_CRYPTO_HW is not set |
535 | CONFIG_XZ_DEC_TEST=m | 542 | CONFIG_XZ_DEC_TEST=m |