aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-11 15:24:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-11 15:24:59 -0400
commit6c6563a4894238a3ed9c40601018816b60c31ec4 (patch)
treea04252b0e667e3f1a574f1ff3735cfab919c864f
parenta56711fa0b418a2cf5eefa00ee65e16443e47790 (diff)
parent7b8ba82ad4ada669c564ec8ccba9cadc6e8abfb1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/defconfig: Update defconfigs for v4.6-rc2 m68k: Wire up preadv2 and pwritev2
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig13
-rw-r--r--arch/m68k/configs/apollo_defconfig13
-rw-r--r--arch/m68k/configs/atari_defconfig13
-rw-r--r--arch/m68k/configs/bvme6000_defconfig13
-rw-r--r--arch/m68k/configs/hp300_defconfig13
-rw-r--r--arch/m68k/configs/mac_defconfig13
-rw-r--r--arch/m68k/configs/multi_defconfig13
-rw-r--r--arch/m68k/configs/mvme147_defconfig13
-rw-r--r--arch/m68k/configs/mvme16x_defconfig13
-rw-r--r--arch/m68k/configs/q40_defconfig13
-rw-r--r--arch/m68k/configs/sun3_defconfig13
-rw-r--r--arch/m68k/configs/sun3x_defconfig13
-rw-r--r--arch/m68k/include/asm/unistd.h2
-rw-r--r--arch/m68k/include/uapi/asm/unistd.h2
-rw-r--r--arch/m68k/kernel/syscalltable.S2
15 files changed, 77 insertions, 85 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index d1fc4796025e..3ee6976f6088 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-amiga" 1CONFIG_LOCALVERSION="-amiga"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -64,7 +63,6 @@ CONFIG_INET_IPCOMP=m
64CONFIG_INET_XFRM_MODE_TRANSPORT=m 63CONFIG_INET_XFRM_MODE_TRANSPORT=m
65CONFIG_INET_XFRM_MODE_TUNNEL=m 64CONFIG_INET_XFRM_MODE_TUNNEL=m
66CONFIG_INET_XFRM_MODE_BEET=m 65CONFIG_INET_XFRM_MODE_BEET=m
67# CONFIG_INET_LRO is not set
68CONFIG_INET_DIAG=m 66CONFIG_INET_DIAG=m
69CONFIG_INET_UDP_DIAG=m 67CONFIG_INET_UDP_DIAG=m
70CONFIG_IPV6=m 68CONFIG_IPV6=m
@@ -285,7 +283,9 @@ CONFIG_NET_MPLS_GSO=m
285CONFIG_MPLS_ROUTING=m 283CONFIG_MPLS_ROUTING=m
286CONFIG_MPLS_IPTUNNEL=m 284CONFIG_MPLS_IPTUNNEL=m
287CONFIG_NET_L3_MASTER_DEV=y 285CONFIG_NET_L3_MASTER_DEV=y
286CONFIG_AF_KCM=m
288# CONFIG_WIRELESS is not set 287# CONFIG_WIRELESS is not set
288CONFIG_NET_DEVLINK=m
289# CONFIG_UEVENT_HELPER is not set 289# CONFIG_UEVENT_HELPER is not set
290CONFIG_DEVTMPFS=y 290CONFIG_DEVTMPFS=y
291CONFIG_DEVTMPFS_MOUNT=y 291CONFIG_DEVTMPFS_MOUNT=y
@@ -359,6 +359,7 @@ CONFIG_MACVTAP=m
359CONFIG_IPVLAN=m 359CONFIG_IPVLAN=m
360CONFIG_VXLAN=m 360CONFIG_VXLAN=m
361CONFIG_GENEVE=m 361CONFIG_GENEVE=m
362CONFIG_MACSEC=m
362CONFIG_NETCONSOLE=m 363CONFIG_NETCONSOLE=m
363CONFIG_NETCONSOLE_DYNAMIC=y 364CONFIG_NETCONSOLE_DYNAMIC=y
364CONFIG_VETH=m 365CONFIG_VETH=m
@@ -452,6 +453,7 @@ CONFIG_JFS_FS=m
452CONFIG_XFS_FS=m 453CONFIG_XFS_FS=m
453CONFIG_OCFS2_FS=m 454CONFIG_OCFS2_FS=m
454# CONFIG_OCFS2_DEBUG_MASKLOG is not set 455# CONFIG_OCFS2_DEBUG_MASKLOG is not set
456CONFIG_FS_ENCRYPTION=m
455CONFIG_FANOTIFY=y 457CONFIG_FANOTIFY=y
456CONFIG_QUOTA_NETLINK_INTERFACE=y 458CONFIG_QUOTA_NETLINK_INTERFACE=y
457# CONFIG_PRINT_QUOTA_WARNING is not set 459# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -468,6 +470,7 @@ CONFIG_VFAT_FS=m
468CONFIG_PROC_KCORE=y 470CONFIG_PROC_KCORE=y
469CONFIG_PROC_CHILDREN=y 471CONFIG_PROC_CHILDREN=y
470CONFIG_TMPFS=y 472CONFIG_TMPFS=y
473CONFIG_ORANGEFS_FS=m
471CONFIG_AFFS_FS=m 474CONFIG_AFFS_FS=m
472CONFIG_ECRYPT_FS=m 475CONFIG_ECRYPT_FS=m
473CONFIG_ECRYPT_FS_MESSAGING=y 476CONFIG_ECRYPT_FS_MESSAGING=y
@@ -549,6 +552,7 @@ CONFIG_TEST_HEXDUMP=m
549CONFIG_TEST_STRING_HELPERS=m 552CONFIG_TEST_STRING_HELPERS=m
550CONFIG_TEST_KSTRTOX=m 553CONFIG_TEST_KSTRTOX=m
551CONFIG_TEST_PRINTF=m 554CONFIG_TEST_PRINTF=m
555CONFIG_TEST_BITMAP=m
552CONFIG_TEST_RHASHTABLE=m 556CONFIG_TEST_RHASHTABLE=m
553CONFIG_TEST_LKM=m 557CONFIG_TEST_LKM=m
554CONFIG_TEST_USER_COPY=m 558CONFIG_TEST_USER_COPY=m
@@ -557,7 +561,6 @@ CONFIG_TEST_FIRMWARE=m
557CONFIG_TEST_UDELAY=m 561CONFIG_TEST_UDELAY=m
558CONFIG_TEST_STATIC_KEYS=m 562CONFIG_TEST_STATIC_KEYS=m
559CONFIG_EARLY_PRINTK=y 563CONFIG_EARLY_PRINTK=y
560CONFIG_ENCRYPTED_KEYS=m
561CONFIG_CRYPTO_RSA=m 564CONFIG_CRYPTO_RSA=m
562CONFIG_CRYPTO_MANAGER=y 565CONFIG_CRYPTO_MANAGER=y
563CONFIG_CRYPTO_USER=m 566CONFIG_CRYPTO_USER=m
@@ -565,12 +568,9 @@ CONFIG_CRYPTO_CRYPTD=m
565CONFIG_CRYPTO_MCRYPTD=m 568CONFIG_CRYPTO_MCRYPTD=m
566CONFIG_CRYPTO_TEST=m 569CONFIG_CRYPTO_TEST=m
567CONFIG_CRYPTO_CCM=m 570CONFIG_CRYPTO_CCM=m
568CONFIG_CRYPTO_GCM=m
569CONFIG_CRYPTO_CHACHA20POLY1305=m 571CONFIG_CRYPTO_CHACHA20POLY1305=m
570CONFIG_CRYPTO_CTS=m
571CONFIG_CRYPTO_LRW=m 572CONFIG_CRYPTO_LRW=m
572CONFIG_CRYPTO_PCBC=m 573CONFIG_CRYPTO_PCBC=m
573CONFIG_CRYPTO_XTS=m
574CONFIG_CRYPTO_KEYWRAP=m 574CONFIG_CRYPTO_KEYWRAP=m
575CONFIG_CRYPTO_XCBC=m 575CONFIG_CRYPTO_XCBC=m
576CONFIG_CRYPTO_VMAC=m 576CONFIG_CRYPTO_VMAC=m
@@ -594,7 +594,6 @@ CONFIG_CRYPTO_SEED=m
594CONFIG_CRYPTO_SERPENT=m 594CONFIG_CRYPTO_SERPENT=m
595CONFIG_CRYPTO_TEA=m 595CONFIG_CRYPTO_TEA=m
596CONFIG_CRYPTO_TWOFISH=m 596CONFIG_CRYPTO_TWOFISH=m
597CONFIG_CRYPTO_ZLIB=m
598CONFIG_CRYPTO_LZO=m 597CONFIG_CRYPTO_LZO=m
599CONFIG_CRYPTO_842=m 598CONFIG_CRYPTO_842=m
600CONFIG_CRYPTO_LZ4=m 599CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 9bfe8be3658c..e96787ffcbce 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-apollo" 1CONFIG_LOCALVERSION="-apollo"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m
62CONFIG_INET_XFRM_MODE_TRANSPORT=m 61CONFIG_INET_XFRM_MODE_TRANSPORT=m
63CONFIG_INET_XFRM_MODE_TUNNEL=m 62CONFIG_INET_XFRM_MODE_TUNNEL=m
64CONFIG_INET_XFRM_MODE_BEET=m 63CONFIG_INET_XFRM_MODE_BEET=m
65# CONFIG_INET_LRO is not set
66CONFIG_INET_DIAG=m 64CONFIG_INET_DIAG=m
67CONFIG_INET_UDP_DIAG=m 65CONFIG_INET_UDP_DIAG=m
68CONFIG_IPV6=m 66CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m
283CONFIG_MPLS_ROUTING=m 281CONFIG_MPLS_ROUTING=m
284CONFIG_MPLS_IPTUNNEL=m 282CONFIG_MPLS_IPTUNNEL=m
285CONFIG_NET_L3_MASTER_DEV=y 283CONFIG_NET_L3_MASTER_DEV=y
284CONFIG_AF_KCM=m
286# CONFIG_WIRELESS is not set 285# CONFIG_WIRELESS is not set
286CONFIG_NET_DEVLINK=m
287# CONFIG_UEVENT_HELPER is not set 287# CONFIG_UEVENT_HELPER is not set
288CONFIG_DEVTMPFS=y 288CONFIG_DEVTMPFS=y
289CONFIG_DEVTMPFS_MOUNT=y 289CONFIG_DEVTMPFS_MOUNT=y
@@ -341,6 +341,7 @@ CONFIG_MACVTAP=m
341CONFIG_IPVLAN=m 341CONFIG_IPVLAN=m
342CONFIG_VXLAN=m 342CONFIG_VXLAN=m
343CONFIG_GENEVE=m 343CONFIG_GENEVE=m
344CONFIG_MACSEC=m
344CONFIG_NETCONSOLE=m 345CONFIG_NETCONSOLE=m
345CONFIG_NETCONSOLE_DYNAMIC=y 346CONFIG_NETCONSOLE_DYNAMIC=y
346CONFIG_VETH=m 347CONFIG_VETH=m
@@ -411,6 +412,7 @@ CONFIG_JFS_FS=m
411CONFIG_XFS_FS=m 412CONFIG_XFS_FS=m
412CONFIG_OCFS2_FS=m 413CONFIG_OCFS2_FS=m
413# CONFIG_OCFS2_DEBUG_MASKLOG is not set 414# CONFIG_OCFS2_DEBUG_MASKLOG is not set
415CONFIG_FS_ENCRYPTION=m
414CONFIG_FANOTIFY=y 416CONFIG_FANOTIFY=y
415CONFIG_QUOTA_NETLINK_INTERFACE=y 417CONFIG_QUOTA_NETLINK_INTERFACE=y
416# CONFIG_PRINT_QUOTA_WARNING is not set 418# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -427,6 +429,7 @@ CONFIG_VFAT_FS=m
427CONFIG_PROC_KCORE=y 429CONFIG_PROC_KCORE=y
428CONFIG_PROC_CHILDREN=y 430CONFIG_PROC_CHILDREN=y
429CONFIG_TMPFS=y 431CONFIG_TMPFS=y
432CONFIG_ORANGEFS_FS=m
430CONFIG_AFFS_FS=m 433CONFIG_AFFS_FS=m
431CONFIG_ECRYPT_FS=m 434CONFIG_ECRYPT_FS=m
432CONFIG_ECRYPT_FS_MESSAGING=y 435CONFIG_ECRYPT_FS_MESSAGING=y
@@ -508,6 +511,7 @@ CONFIG_TEST_HEXDUMP=m
508CONFIG_TEST_STRING_HELPERS=m 511CONFIG_TEST_STRING_HELPERS=m
509CONFIG_TEST_KSTRTOX=m 512CONFIG_TEST_KSTRTOX=m
510CONFIG_TEST_PRINTF=m 513CONFIG_TEST_PRINTF=m
514CONFIG_TEST_BITMAP=m
511CONFIG_TEST_RHASHTABLE=m 515CONFIG_TEST_RHASHTABLE=m
512CONFIG_TEST_LKM=m 516CONFIG_TEST_LKM=m
513CONFIG_TEST_USER_COPY=m 517CONFIG_TEST_USER_COPY=m
@@ -516,7 +520,6 @@ CONFIG_TEST_FIRMWARE=m
516CONFIG_TEST_UDELAY=m 520CONFIG_TEST_UDELAY=m
517CONFIG_TEST_STATIC_KEYS=m 521CONFIG_TEST_STATIC_KEYS=m
518CONFIG_EARLY_PRINTK=y 522CONFIG_EARLY_PRINTK=y
519CONFIG_ENCRYPTED_KEYS=m
520CONFIG_CRYPTO_RSA=m 523CONFIG_CRYPTO_RSA=m
521CONFIG_CRYPTO_MANAGER=y 524CONFIG_CRYPTO_MANAGER=y
522CONFIG_CRYPTO_USER=m 525CONFIG_CRYPTO_USER=m
@@ -524,12 +527,9 @@ CONFIG_CRYPTO_CRYPTD=m
524CONFIG_CRYPTO_MCRYPTD=m 527CONFIG_CRYPTO_MCRYPTD=m
525CONFIG_CRYPTO_TEST=m 528CONFIG_CRYPTO_TEST=m
526CONFIG_CRYPTO_CCM=m 529CONFIG_CRYPTO_CCM=m
527CONFIG_CRYPTO_GCM=m
528CONFIG_CRYPTO_CHACHA20POLY1305=m 530CONFIG_CRYPTO_CHACHA20POLY1305=m
529CONFIG_CRYPTO_CTS=m
530CONFIG_CRYPTO_LRW=m 531CONFIG_CRYPTO_LRW=m
531CONFIG_CRYPTO_PCBC=m 532CONFIG_CRYPTO_PCBC=m
532CONFIG_CRYPTO_XTS=m
533CONFIG_CRYPTO_KEYWRAP=m 533CONFIG_CRYPTO_KEYWRAP=m
534CONFIG_CRYPTO_XCBC=m 534CONFIG_CRYPTO_XCBC=m
535CONFIG_CRYPTO_VMAC=m 535CONFIG_CRYPTO_VMAC=m
@@ -553,7 +553,6 @@ CONFIG_CRYPTO_SEED=m
553CONFIG_CRYPTO_SERPENT=m 553CONFIG_CRYPTO_SERPENT=m
554CONFIG_CRYPTO_TEA=m 554CONFIG_CRYPTO_TEA=m
555CONFIG_CRYPTO_TWOFISH=m 555CONFIG_CRYPTO_TWOFISH=m
556CONFIG_CRYPTO_ZLIB=m
557CONFIG_CRYPTO_LZO=m 556CONFIG_CRYPTO_LZO=m
558CONFIG_CRYPTO_842=m 557CONFIG_CRYPTO_842=m
559CONFIG_CRYPTO_LZ4=m 558CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index ebdcfae55580..083fe6beac14 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-atari" 1CONFIG_LOCALVERSION="-atari"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m
62CONFIG_INET_XFRM_MODE_TRANSPORT=m 61CONFIG_INET_XFRM_MODE_TRANSPORT=m
63CONFIG_INET_XFRM_MODE_TUNNEL=m 62CONFIG_INET_XFRM_MODE_TUNNEL=m
64CONFIG_INET_XFRM_MODE_BEET=m 63CONFIG_INET_XFRM_MODE_BEET=m
65# CONFIG_INET_LRO is not set
66CONFIG_INET_DIAG=m 64CONFIG_INET_DIAG=m
67CONFIG_INET_UDP_DIAG=m 65CONFIG_INET_UDP_DIAG=m
68CONFIG_IPV6=m 66CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m
283CONFIG_MPLS_ROUTING=m 281CONFIG_MPLS_ROUTING=m
284CONFIG_MPLS_IPTUNNEL=m 282CONFIG_MPLS_IPTUNNEL=m
285CONFIG_NET_L3_MASTER_DEV=y 283CONFIG_NET_L3_MASTER_DEV=y
284CONFIG_AF_KCM=m
286# CONFIG_WIRELESS is not set 285# CONFIG_WIRELESS is not set
286CONFIG_NET_DEVLINK=m
287# CONFIG_UEVENT_HELPER is not set 287# CONFIG_UEVENT_HELPER is not set
288CONFIG_DEVTMPFS=y 288CONFIG_DEVTMPFS=y
289CONFIG_DEVTMPFS_MOUNT=y 289CONFIG_DEVTMPFS_MOUNT=y
@@ -350,6 +350,7 @@ CONFIG_MACVTAP=m
350CONFIG_IPVLAN=m 350CONFIG_IPVLAN=m
351CONFIG_VXLAN=m 351CONFIG_VXLAN=m
352CONFIG_GENEVE=m 352CONFIG_GENEVE=m
353CONFIG_MACSEC=m
353CONFIG_NETCONSOLE=m 354CONFIG_NETCONSOLE=m
354CONFIG_NETCONSOLE_DYNAMIC=y 355CONFIG_NETCONSOLE_DYNAMIC=y
355CONFIG_VETH=m 356CONFIG_VETH=m
@@ -432,6 +433,7 @@ CONFIG_JFS_FS=m
432CONFIG_XFS_FS=m 433CONFIG_XFS_FS=m
433CONFIG_OCFS2_FS=m 434CONFIG_OCFS2_FS=m
434# CONFIG_OCFS2_DEBUG_MASKLOG is not set 435# CONFIG_OCFS2_DEBUG_MASKLOG is not set
436CONFIG_FS_ENCRYPTION=m
435CONFIG_FANOTIFY=y 437CONFIG_FANOTIFY=y
436CONFIG_QUOTA_NETLINK_INTERFACE=y 438CONFIG_QUOTA_NETLINK_INTERFACE=y
437# CONFIG_PRINT_QUOTA_WARNING is not set 439# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -448,6 +450,7 @@ CONFIG_VFAT_FS=m
448CONFIG_PROC_KCORE=y 450CONFIG_PROC_KCORE=y
449CONFIG_PROC_CHILDREN=y 451CONFIG_PROC_CHILDREN=y
450CONFIG_TMPFS=y 452CONFIG_TMPFS=y
453CONFIG_ORANGEFS_FS=m
451CONFIG_AFFS_FS=m 454CONFIG_AFFS_FS=m
452CONFIG_ECRYPT_FS=m 455CONFIG_ECRYPT_FS=m
453CONFIG_ECRYPT_FS_MESSAGING=y 456CONFIG_ECRYPT_FS_MESSAGING=y
@@ -529,6 +532,7 @@ CONFIG_TEST_HEXDUMP=m
529CONFIG_TEST_STRING_HELPERS=m 532CONFIG_TEST_STRING_HELPERS=m
530CONFIG_TEST_KSTRTOX=m 533CONFIG_TEST_KSTRTOX=m
531CONFIG_TEST_PRINTF=m 534CONFIG_TEST_PRINTF=m
535CONFIG_TEST_BITMAP=m
532CONFIG_TEST_RHASHTABLE=m 536CONFIG_TEST_RHASHTABLE=m
533CONFIG_TEST_LKM=m 537CONFIG_TEST_LKM=m
534CONFIG_TEST_USER_COPY=m 538CONFIG_TEST_USER_COPY=m
@@ -537,7 +541,6 @@ CONFIG_TEST_FIRMWARE=m
537CONFIG_TEST_UDELAY=m 541CONFIG_TEST_UDELAY=m
538CONFIG_TEST_STATIC_KEYS=m 542CONFIG_TEST_STATIC_KEYS=m
539CONFIG_EARLY_PRINTK=y 543CONFIG_EARLY_PRINTK=y
540CONFIG_ENCRYPTED_KEYS=m
541CONFIG_CRYPTO_RSA=m 544CONFIG_CRYPTO_RSA=m
542CONFIG_CRYPTO_MANAGER=y 545CONFIG_CRYPTO_MANAGER=y
543CONFIG_CRYPTO_USER=m 546CONFIG_CRYPTO_USER=m
@@ -545,12 +548,9 @@ CONFIG_CRYPTO_CRYPTD=m
545CONFIG_CRYPTO_MCRYPTD=m 548CONFIG_CRYPTO_MCRYPTD=m
546CONFIG_CRYPTO_TEST=m 549CONFIG_CRYPTO_TEST=m
547CONFIG_CRYPTO_CCM=m 550CONFIG_CRYPTO_CCM=m
548CONFIG_CRYPTO_GCM=m
549CONFIG_CRYPTO_CHACHA20POLY1305=m 551CONFIG_CRYPTO_CHACHA20POLY1305=m
550CONFIG_CRYPTO_CTS=m
551CONFIG_CRYPTO_LRW=m 552CONFIG_CRYPTO_LRW=m
552CONFIG_CRYPTO_PCBC=m 553CONFIG_CRYPTO_PCBC=m
553CONFIG_CRYPTO_XTS=m
554CONFIG_CRYPTO_KEYWRAP=m 554CONFIG_CRYPTO_KEYWRAP=m
555CONFIG_CRYPTO_XCBC=m 555CONFIG_CRYPTO_XCBC=m
556CONFIG_CRYPTO_VMAC=m 556CONFIG_CRYPTO_VMAC=m
@@ -574,7 +574,6 @@ CONFIG_CRYPTO_SEED=m
574CONFIG_CRYPTO_SERPENT=m 574CONFIG_CRYPTO_SERPENT=m
575CONFIG_CRYPTO_TEA=m 575CONFIG_CRYPTO_TEA=m
576CONFIG_CRYPTO_TWOFISH=m 576CONFIG_CRYPTO_TWOFISH=m
577CONFIG_CRYPTO_ZLIB=m
578CONFIG_CRYPTO_LZO=m 577CONFIG_CRYPTO_LZO=m
579CONFIG_CRYPTO_842=m 578CONFIG_CRYPTO_842=m
580CONFIG_CRYPTO_LZ4=m 579CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 8acc65e54995..475130c06dcb 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-bvme6000" 1CONFIG_LOCALVERSION="-bvme6000"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -60,7 +59,6 @@ CONFIG_INET_IPCOMP=m
60CONFIG_INET_XFRM_MODE_TRANSPORT=m 59CONFIG_INET_XFRM_MODE_TRANSPORT=m
61CONFIG_INET_XFRM_MODE_TUNNEL=m 60CONFIG_INET_XFRM_MODE_TUNNEL=m
62CONFIG_INET_XFRM_MODE_BEET=m 61CONFIG_INET_XFRM_MODE_BEET=m
63# CONFIG_INET_LRO is not set
64CONFIG_INET_DIAG=m 62CONFIG_INET_DIAG=m
65CONFIG_INET_UDP_DIAG=m 63CONFIG_INET_UDP_DIAG=m
66CONFIG_IPV6=m 64CONFIG_IPV6=m
@@ -281,7 +279,9 @@ CONFIG_NET_MPLS_GSO=m
281CONFIG_MPLS_ROUTING=m 279CONFIG_MPLS_ROUTING=m
282CONFIG_MPLS_IPTUNNEL=m 280CONFIG_MPLS_IPTUNNEL=m
283CONFIG_NET_L3_MASTER_DEV=y 281CONFIG_NET_L3_MASTER_DEV=y
282CONFIG_AF_KCM=m
284# CONFIG_WIRELESS is not set 283# CONFIG_WIRELESS is not set
284CONFIG_NET_DEVLINK=m
285# CONFIG_UEVENT_HELPER is not set 285# CONFIG_UEVENT_HELPER is not set
286CONFIG_DEVTMPFS=y 286CONFIG_DEVTMPFS=y
287CONFIG_DEVTMPFS_MOUNT=y 287CONFIG_DEVTMPFS_MOUNT=y
@@ -340,6 +340,7 @@ CONFIG_MACVTAP=m
340CONFIG_IPVLAN=m 340CONFIG_IPVLAN=m
341CONFIG_VXLAN=m 341CONFIG_VXLAN=m
342CONFIG_GENEVE=m 342CONFIG_GENEVE=m
343CONFIG_MACSEC=m
343CONFIG_NETCONSOLE=m 344CONFIG_NETCONSOLE=m
344CONFIG_NETCONSOLE_DYNAMIC=y 345CONFIG_NETCONSOLE_DYNAMIC=y
345CONFIG_VETH=m 346CONFIG_VETH=m
@@ -403,6 +404,7 @@ CONFIG_JFS_FS=m
403CONFIG_XFS_FS=m 404CONFIG_XFS_FS=m
404CONFIG_OCFS2_FS=m 405CONFIG_OCFS2_FS=m
405# CONFIG_OCFS2_DEBUG_MASKLOG is not set 406# CONFIG_OCFS2_DEBUG_MASKLOG is not set
407CONFIG_FS_ENCRYPTION=m
406CONFIG_FANOTIFY=y 408CONFIG_FANOTIFY=y
407CONFIG_QUOTA_NETLINK_INTERFACE=y 409CONFIG_QUOTA_NETLINK_INTERFACE=y
408# CONFIG_PRINT_QUOTA_WARNING is not set 410# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -419,6 +421,7 @@ CONFIG_VFAT_FS=m
419CONFIG_PROC_KCORE=y 421CONFIG_PROC_KCORE=y
420CONFIG_PROC_CHILDREN=y 422CONFIG_PROC_CHILDREN=y
421CONFIG_TMPFS=y 423CONFIG_TMPFS=y
424CONFIG_ORANGEFS_FS=m
422CONFIG_AFFS_FS=m 425CONFIG_AFFS_FS=m
423CONFIG_ECRYPT_FS=m 426CONFIG_ECRYPT_FS=m
424CONFIG_ECRYPT_FS_MESSAGING=y 427CONFIG_ECRYPT_FS_MESSAGING=y
@@ -500,6 +503,7 @@ CONFIG_TEST_HEXDUMP=m
500CONFIG_TEST_STRING_HELPERS=m 503CONFIG_TEST_STRING_HELPERS=m
501CONFIG_TEST_KSTRTOX=m 504CONFIG_TEST_KSTRTOX=m
502CONFIG_TEST_PRINTF=m 505CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m
503CONFIG_TEST_RHASHTABLE=m 507CONFIG_TEST_RHASHTABLE=m
504CONFIG_TEST_LKM=m 508CONFIG_TEST_LKM=m
505CONFIG_TEST_USER_COPY=m 509CONFIG_TEST_USER_COPY=m
@@ -508,7 +512,6 @@ CONFIG_TEST_FIRMWARE=m
508CONFIG_TEST_UDELAY=m 512CONFIG_TEST_UDELAY=m
509CONFIG_TEST_STATIC_KEYS=m 513CONFIG_TEST_STATIC_KEYS=m
510CONFIG_EARLY_PRINTK=y 514CONFIG_EARLY_PRINTK=y
511CONFIG_ENCRYPTED_KEYS=m
512CONFIG_CRYPTO_RSA=m 515CONFIG_CRYPTO_RSA=m
513CONFIG_CRYPTO_MANAGER=y 516CONFIG_CRYPTO_MANAGER=y
514CONFIG_CRYPTO_USER=m 517CONFIG_CRYPTO_USER=m
@@ -516,12 +519,9 @@ CONFIG_CRYPTO_CRYPTD=m
516CONFIG_CRYPTO_MCRYPTD=m 519CONFIG_CRYPTO_MCRYPTD=m
517CONFIG_CRYPTO_TEST=m 520CONFIG_CRYPTO_TEST=m
518CONFIG_CRYPTO_CCM=m 521CONFIG_CRYPTO_CCM=m
519CONFIG_CRYPTO_GCM=m
520CONFIG_CRYPTO_CHACHA20POLY1305=m 522CONFIG_CRYPTO_CHACHA20POLY1305=m
521CONFIG_CRYPTO_CTS=m
522CONFIG_CRYPTO_LRW=m 523CONFIG_CRYPTO_LRW=m
523CONFIG_CRYPTO_PCBC=m 524CONFIG_CRYPTO_PCBC=m
524CONFIG_CRYPTO_XTS=m
525CONFIG_CRYPTO_KEYWRAP=m 525CONFIG_CRYPTO_KEYWRAP=m
526CONFIG_CRYPTO_XCBC=m 526CONFIG_CRYPTO_XCBC=m
527CONFIG_CRYPTO_VMAC=m 527CONFIG_CRYPTO_VMAC=m
@@ -545,7 +545,6 @@ CONFIG_CRYPTO_SEED=m
545CONFIG_CRYPTO_SERPENT=m 545CONFIG_CRYPTO_SERPENT=m
546CONFIG_CRYPTO_TEA=m 546CONFIG_CRYPTO_TEA=m
547CONFIG_CRYPTO_TWOFISH=m 547CONFIG_CRYPTO_TWOFISH=m
548CONFIG_CRYPTO_ZLIB=m
549CONFIG_CRYPTO_LZO=m 548CONFIG_CRYPTO_LZO=m
550CONFIG_CRYPTO_842=m 549CONFIG_CRYPTO_842=m
551CONFIG_CRYPTO_LZ4=m 550CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 0c6a3d52b26e..4339658c200f 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-hp300" 1CONFIG_LOCALVERSION="-hp300"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -62,7 +61,6 @@ CONFIG_INET_IPCOMP=m
62CONFIG_INET_XFRM_MODE_TRANSPORT=m 61CONFIG_INET_XFRM_MODE_TRANSPORT=m
63CONFIG_INET_XFRM_MODE_TUNNEL=m 62CONFIG_INET_XFRM_MODE_TUNNEL=m
64CONFIG_INET_XFRM_MODE_BEET=m 63CONFIG_INET_XFRM_MODE_BEET=m
65# CONFIG_INET_LRO is not set
66CONFIG_INET_DIAG=m 64CONFIG_INET_DIAG=m
67CONFIG_INET_UDP_DIAG=m 65CONFIG_INET_UDP_DIAG=m
68CONFIG_IPV6=m 66CONFIG_IPV6=m
@@ -283,7 +281,9 @@ CONFIG_NET_MPLS_GSO=m
283CONFIG_MPLS_ROUTING=m 281CONFIG_MPLS_ROUTING=m
284CONFIG_MPLS_IPTUNNEL=m 282CONFIG_MPLS_IPTUNNEL=m
285CONFIG_NET_L3_MASTER_DEV=y 283CONFIG_NET_L3_MASTER_DEV=y
284CONFIG_AF_KCM=m
286# CONFIG_WIRELESS is not set 285# CONFIG_WIRELESS is not set
286CONFIG_NET_DEVLINK=m
287# CONFIG_UEVENT_HELPER is not set 287# CONFIG_UEVENT_HELPER is not set
288CONFIG_DEVTMPFS=y 288CONFIG_DEVTMPFS=y
289CONFIG_DEVTMPFS_MOUNT=y 289CONFIG_DEVTMPFS_MOUNT=y
@@ -341,6 +341,7 @@ CONFIG_MACVTAP=m
341CONFIG_IPVLAN=m 341CONFIG_IPVLAN=m
342CONFIG_VXLAN=m 342CONFIG_VXLAN=m
343CONFIG_GENEVE=m 343CONFIG_GENEVE=m
344CONFIG_MACSEC=m
344CONFIG_NETCONSOLE=m 345CONFIG_NETCONSOLE=m
345CONFIG_NETCONSOLE_DYNAMIC=y 346CONFIG_NETCONSOLE_DYNAMIC=y
346CONFIG_VETH=m 347CONFIG_VETH=m
@@ -413,6 +414,7 @@ CONFIG_JFS_FS=m
413CONFIG_XFS_FS=m 414CONFIG_XFS_FS=m
414CONFIG_OCFS2_FS=m 415CONFIG_OCFS2_FS=m
415# CONFIG_OCFS2_DEBUG_MASKLOG is not set 416# CONFIG_OCFS2_DEBUG_MASKLOG is not set
417CONFIG_FS_ENCRYPTION=m
416CONFIG_FANOTIFY=y 418CONFIG_FANOTIFY=y
417CONFIG_QUOTA_NETLINK_INTERFACE=y 419CONFIG_QUOTA_NETLINK_INTERFACE=y
418# CONFIG_PRINT_QUOTA_WARNING is not set 420# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -429,6 +431,7 @@ CONFIG_VFAT_FS=m
429CONFIG_PROC_KCORE=y 431CONFIG_PROC_KCORE=y
430CONFIG_PROC_CHILDREN=y 432CONFIG_PROC_CHILDREN=y
431CONFIG_TMPFS=y 433CONFIG_TMPFS=y
434CONFIG_ORANGEFS_FS=m
432CONFIG_AFFS_FS=m 435CONFIG_AFFS_FS=m
433CONFIG_ECRYPT_FS=m 436CONFIG_ECRYPT_FS=m
434CONFIG_ECRYPT_FS_MESSAGING=y 437CONFIG_ECRYPT_FS_MESSAGING=y
@@ -510,6 +513,7 @@ CONFIG_TEST_HEXDUMP=m
510CONFIG_TEST_STRING_HELPERS=m 513CONFIG_TEST_STRING_HELPERS=m
511CONFIG_TEST_KSTRTOX=m 514CONFIG_TEST_KSTRTOX=m
512CONFIG_TEST_PRINTF=m 515CONFIG_TEST_PRINTF=m
516CONFIG_TEST_BITMAP=m
513CONFIG_TEST_RHASHTABLE=m 517CONFIG_TEST_RHASHTABLE=m
514CONFIG_TEST_LKM=m 518CONFIG_TEST_LKM=m
515CONFIG_TEST_USER_COPY=m 519CONFIG_TEST_USER_COPY=m
@@ -518,7 +522,6 @@ CONFIG_TEST_FIRMWARE=m
518CONFIG_TEST_UDELAY=m 522CONFIG_TEST_UDELAY=m
519CONFIG_TEST_STATIC_KEYS=m 523CONFIG_TEST_STATIC_KEYS=m
520CONFIG_EARLY_PRINTK=y 524CONFIG_EARLY_PRINTK=y
521CONFIG_ENCRYPTED_KEYS=m
522CONFIG_CRYPTO_RSA=m 525CONFIG_CRYPTO_RSA=m
523CONFIG_CRYPTO_MANAGER=y 526CONFIG_CRYPTO_MANAGER=y
524CONFIG_CRYPTO_USER=m 527CONFIG_CRYPTO_USER=m
@@ -526,12 +529,9 @@ CONFIG_CRYPTO_CRYPTD=m
526CONFIG_CRYPTO_MCRYPTD=m 529CONFIG_CRYPTO_MCRYPTD=m
527CONFIG_CRYPTO_TEST=m 530CONFIG_CRYPTO_TEST=m
528CONFIG_CRYPTO_CCM=m 531CONFIG_CRYPTO_CCM=m
529CONFIG_CRYPTO_GCM=m
530CONFIG_CRYPTO_CHACHA20POLY1305=m 532CONFIG_CRYPTO_CHACHA20POLY1305=m
531CONFIG_CRYPTO_CTS=m
532CONFIG_CRYPTO_LRW=m 533CONFIG_CRYPTO_LRW=m
533CONFIG_CRYPTO_PCBC=m 534CONFIG_CRYPTO_PCBC=m
534CONFIG_CRYPTO_XTS=m
535CONFIG_CRYPTO_KEYWRAP=m 535CONFIG_CRYPTO_KEYWRAP=m
536CONFIG_CRYPTO_XCBC=m 536CONFIG_CRYPTO_XCBC=m
537CONFIG_CRYPTO_VMAC=m 537CONFIG_CRYPTO_VMAC=m
@@ -555,7 +555,6 @@ CONFIG_CRYPTO_SEED=m
555CONFIG_CRYPTO_SERPENT=m 555CONFIG_CRYPTO_SERPENT=m
556CONFIG_CRYPTO_TEA=m 556CONFIG_CRYPTO_TEA=m
557CONFIG_CRYPTO_TWOFISH=m 557CONFIG_CRYPTO_TWOFISH=m
558CONFIG_CRYPTO_ZLIB=m
559CONFIG_CRYPTO_LZO=m 558CONFIG_CRYPTO_LZO=m
560CONFIG_CRYPTO_842=m 559CONFIG_CRYPTO_842=m
561CONFIG_CRYPTO_LZ4=m 560CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 12a8a6cb32f4..831cc8c3a2e2 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-mac" 1CONFIG_LOCALVERSION="-mac"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -61,7 +60,6 @@ CONFIG_INET_IPCOMP=m
61CONFIG_INET_XFRM_MODE_TRANSPORT=m 60CONFIG_INET_XFRM_MODE_TRANSPORT=m
62CONFIG_INET_XFRM_MODE_TUNNEL=m 61CONFIG_INET_XFRM_MODE_TUNNEL=m
63CONFIG_INET_XFRM_MODE_BEET=m 62CONFIG_INET_XFRM_MODE_BEET=m
64# CONFIG_INET_LRO is not set
65CONFIG_INET_DIAG=m 63CONFIG_INET_DIAG=m
66CONFIG_INET_UDP_DIAG=m 64CONFIG_INET_UDP_DIAG=m
67CONFIG_IPV6=m 65CONFIG_IPV6=m
@@ -285,7 +283,9 @@ CONFIG_NET_MPLS_GSO=m
285CONFIG_MPLS_ROUTING=m 283CONFIG_MPLS_ROUTING=m
286CONFIG_MPLS_IPTUNNEL=m 284CONFIG_MPLS_IPTUNNEL=m
287CONFIG_NET_L3_MASTER_DEV=y 285CONFIG_NET_L3_MASTER_DEV=y
286CONFIG_AF_KCM=m
288# CONFIG_WIRELESS is not set 287# CONFIG_WIRELESS is not set
288CONFIG_NET_DEVLINK=m
289# CONFIG_UEVENT_HELPER is not set 289# CONFIG_UEVENT_HELPER is not set
290CONFIG_DEVTMPFS=y 290CONFIG_DEVTMPFS=y
291CONFIG_DEVTMPFS_MOUNT=y 291CONFIG_DEVTMPFS_MOUNT=y
@@ -357,6 +357,7 @@ CONFIG_MACVTAP=m
357CONFIG_IPVLAN=m 357CONFIG_IPVLAN=m
358CONFIG_VXLAN=m 358CONFIG_VXLAN=m
359CONFIG_GENEVE=m 359CONFIG_GENEVE=m
360CONFIG_MACSEC=m
360CONFIG_NETCONSOLE=m 361CONFIG_NETCONSOLE=m
361CONFIG_NETCONSOLE_DYNAMIC=y 362CONFIG_NETCONSOLE_DYNAMIC=y
362CONFIG_VETH=m 363CONFIG_VETH=m
@@ -435,6 +436,7 @@ CONFIG_JFS_FS=m
435CONFIG_XFS_FS=m 436CONFIG_XFS_FS=m
436CONFIG_OCFS2_FS=m 437CONFIG_OCFS2_FS=m
437# CONFIG_OCFS2_DEBUG_MASKLOG is not set 438# CONFIG_OCFS2_DEBUG_MASKLOG is not set
439CONFIG_FS_ENCRYPTION=m
438CONFIG_FANOTIFY=y 440CONFIG_FANOTIFY=y
439CONFIG_QUOTA_NETLINK_INTERFACE=y 441CONFIG_QUOTA_NETLINK_INTERFACE=y
440# CONFIG_PRINT_QUOTA_WARNING is not set 442# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -451,6 +453,7 @@ CONFIG_VFAT_FS=m
451CONFIG_PROC_KCORE=y 453CONFIG_PROC_KCORE=y
452CONFIG_PROC_CHILDREN=y 454CONFIG_PROC_CHILDREN=y
453CONFIG_TMPFS=y 455CONFIG_TMPFS=y
456CONFIG_ORANGEFS_FS=m
454CONFIG_AFFS_FS=m 457CONFIG_AFFS_FS=m
455CONFIG_ECRYPT_FS=m 458CONFIG_ECRYPT_FS=m
456CONFIG_ECRYPT_FS_MESSAGING=y 459CONFIG_ECRYPT_FS_MESSAGING=y
@@ -532,6 +535,7 @@ CONFIG_TEST_HEXDUMP=m
532CONFIG_TEST_STRING_HELPERS=m 535CONFIG_TEST_STRING_HELPERS=m
533CONFIG_TEST_KSTRTOX=m 536CONFIG_TEST_KSTRTOX=m
534CONFIG_TEST_PRINTF=m 537CONFIG_TEST_PRINTF=m
538CONFIG_TEST_BITMAP=m
535CONFIG_TEST_RHASHTABLE=m 539CONFIG_TEST_RHASHTABLE=m
536CONFIG_TEST_LKM=m 540CONFIG_TEST_LKM=m
537CONFIG_TEST_USER_COPY=m 541CONFIG_TEST_USER_COPY=m
@@ -540,7 +544,6 @@ CONFIG_TEST_FIRMWARE=m
540CONFIG_TEST_UDELAY=m 544CONFIG_TEST_UDELAY=m
541CONFIG_TEST_STATIC_KEYS=m 545CONFIG_TEST_STATIC_KEYS=m
542CONFIG_EARLY_PRINTK=y 546CONFIG_EARLY_PRINTK=y
543CONFIG_ENCRYPTED_KEYS=m
544CONFIG_CRYPTO_RSA=m 547CONFIG_CRYPTO_RSA=m
545CONFIG_CRYPTO_MANAGER=y 548CONFIG_CRYPTO_MANAGER=y
546CONFIG_CRYPTO_USER=m 549CONFIG_CRYPTO_USER=m
@@ -548,12 +551,9 @@ CONFIG_CRYPTO_CRYPTD=m
548CONFIG_CRYPTO_MCRYPTD=m 551CONFIG_CRYPTO_MCRYPTD=m
549CONFIG_CRYPTO_TEST=m 552CONFIG_CRYPTO_TEST=m
550CONFIG_CRYPTO_CCM=m 553CONFIG_CRYPTO_CCM=m
551CONFIG_CRYPTO_GCM=m
552CONFIG_CRYPTO_CHACHA20POLY1305=m 554CONFIG_CRYPTO_CHACHA20POLY1305=m
553CONFIG_CRYPTO_CTS=m
554CONFIG_CRYPTO_LRW=m 555CONFIG_CRYPTO_LRW=m
555CONFIG_CRYPTO_PCBC=m 556CONFIG_CRYPTO_PCBC=m
556CONFIG_CRYPTO_XTS=m
557CONFIG_CRYPTO_KEYWRAP=m 557CONFIG_CRYPTO_KEYWRAP=m
558CONFIG_CRYPTO_XCBC=m 558CONFIG_CRYPTO_XCBC=m
559CONFIG_CRYPTO_VMAC=m 559CONFIG_CRYPTO_VMAC=m
@@ -577,7 +577,6 @@ CONFIG_CRYPTO_SEED=m
577CONFIG_CRYPTO_SERPENT=m 577CONFIG_CRYPTO_SERPENT=m
578CONFIG_CRYPTO_TEA=m 578CONFIG_CRYPTO_TEA=m
579CONFIG_CRYPTO_TWOFISH=m 579CONFIG_CRYPTO_TWOFISH=m
580CONFIG_CRYPTO_ZLIB=m
581CONFIG_CRYPTO_LZO=m 580CONFIG_CRYPTO_LZO=m
582CONFIG_CRYPTO_842=m 581CONFIG_CRYPTO_842=m
583CONFIG_CRYPTO_LZ4=m 582CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 64ff2dcb34c8..6377afeb522b 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-multi" 1CONFIG_LOCALVERSION="-multi"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -71,7 +70,6 @@ CONFIG_INET_IPCOMP=m
71CONFIG_INET_XFRM_MODE_TRANSPORT=m 70CONFIG_INET_XFRM_MODE_TRANSPORT=m
72CONFIG_INET_XFRM_MODE_TUNNEL=m 71CONFIG_INET_XFRM_MODE_TUNNEL=m
73CONFIG_INET_XFRM_MODE_BEET=m 72CONFIG_INET_XFRM_MODE_BEET=m
74# CONFIG_INET_LRO is not set
75CONFIG_INET_DIAG=m 73CONFIG_INET_DIAG=m
76CONFIG_INET_UDP_DIAG=m 74CONFIG_INET_UDP_DIAG=m
77CONFIG_IPV6=m 75CONFIG_IPV6=m
@@ -295,7 +293,9 @@ CONFIG_NET_MPLS_GSO=m
295CONFIG_MPLS_ROUTING=m 293CONFIG_MPLS_ROUTING=m
296CONFIG_MPLS_IPTUNNEL=m 294CONFIG_MPLS_IPTUNNEL=m
297CONFIG_NET_L3_MASTER_DEV=y 295CONFIG_NET_L3_MASTER_DEV=y
296CONFIG_AF_KCM=m
298# CONFIG_WIRELESS is not set 297# CONFIG_WIRELESS is not set
298CONFIG_NET_DEVLINK=m
299# CONFIG_UEVENT_HELPER is not set 299# CONFIG_UEVENT_HELPER is not set
300CONFIG_DEVTMPFS=y 300CONFIG_DEVTMPFS=y
301CONFIG_DEVTMPFS_MOUNT=y 301CONFIG_DEVTMPFS_MOUNT=y
@@ -390,6 +390,7 @@ CONFIG_MACVTAP=m
390CONFIG_IPVLAN=m 390CONFIG_IPVLAN=m
391CONFIG_VXLAN=m 391CONFIG_VXLAN=m
392CONFIG_GENEVE=m 392CONFIG_GENEVE=m
393CONFIG_MACSEC=m
393CONFIG_NETCONSOLE=m 394CONFIG_NETCONSOLE=m
394CONFIG_NETCONSOLE_DYNAMIC=y 395CONFIG_NETCONSOLE_DYNAMIC=y
395CONFIG_VETH=m 396CONFIG_VETH=m
@@ -515,6 +516,7 @@ CONFIG_JFS_FS=m
515CONFIG_XFS_FS=m 516CONFIG_XFS_FS=m
516CONFIG_OCFS2_FS=m 517CONFIG_OCFS2_FS=m
517# CONFIG_OCFS2_DEBUG_MASKLOG is not set 518# CONFIG_OCFS2_DEBUG_MASKLOG is not set
519CONFIG_FS_ENCRYPTION=m
518CONFIG_FANOTIFY=y 520CONFIG_FANOTIFY=y
519CONFIG_QUOTA_NETLINK_INTERFACE=y 521CONFIG_QUOTA_NETLINK_INTERFACE=y
520# CONFIG_PRINT_QUOTA_WARNING is not set 522# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -531,6 +533,7 @@ CONFIG_VFAT_FS=m
531CONFIG_PROC_KCORE=y 533CONFIG_PROC_KCORE=y
532CONFIG_PROC_CHILDREN=y 534CONFIG_PROC_CHILDREN=y
533CONFIG_TMPFS=y 535CONFIG_TMPFS=y
536CONFIG_ORANGEFS_FS=m
534CONFIG_AFFS_FS=m 537CONFIG_AFFS_FS=m
535CONFIG_ECRYPT_FS=m 538CONFIG_ECRYPT_FS=m
536CONFIG_ECRYPT_FS_MESSAGING=y 539CONFIG_ECRYPT_FS_MESSAGING=y
@@ -612,6 +615,7 @@ CONFIG_TEST_HEXDUMP=m
612CONFIG_TEST_STRING_HELPERS=m 615CONFIG_TEST_STRING_HELPERS=m
613CONFIG_TEST_KSTRTOX=m 616CONFIG_TEST_KSTRTOX=m
614CONFIG_TEST_PRINTF=m 617CONFIG_TEST_PRINTF=m
618CONFIG_TEST_BITMAP=m
615CONFIG_TEST_RHASHTABLE=m 619CONFIG_TEST_RHASHTABLE=m
616CONFIG_TEST_LKM=m 620CONFIG_TEST_LKM=m
617CONFIG_TEST_USER_COPY=m 621CONFIG_TEST_USER_COPY=m
@@ -620,7 +624,6 @@ CONFIG_TEST_FIRMWARE=m
620CONFIG_TEST_UDELAY=m 624CONFIG_TEST_UDELAY=m
621CONFIG_TEST_STATIC_KEYS=m 625CONFIG_TEST_STATIC_KEYS=m
622CONFIG_EARLY_PRINTK=y 626CONFIG_EARLY_PRINTK=y
623CONFIG_ENCRYPTED_KEYS=m
624CONFIG_CRYPTO_RSA=m 627CONFIG_CRYPTO_RSA=m
625CONFIG_CRYPTO_MANAGER=y 628CONFIG_CRYPTO_MANAGER=y
626CONFIG_CRYPTO_USER=m 629CONFIG_CRYPTO_USER=m
@@ -628,12 +631,9 @@ CONFIG_CRYPTO_CRYPTD=m
628CONFIG_CRYPTO_MCRYPTD=m 631CONFIG_CRYPTO_MCRYPTD=m
629CONFIG_CRYPTO_TEST=m 632CONFIG_CRYPTO_TEST=m
630CONFIG_CRYPTO_CCM=m 633CONFIG_CRYPTO_CCM=m
631CONFIG_CRYPTO_GCM=m
632CONFIG_CRYPTO_CHACHA20POLY1305=m 634CONFIG_CRYPTO_CHACHA20POLY1305=m
633CONFIG_CRYPTO_CTS=m
634CONFIG_CRYPTO_LRW=m 635CONFIG_CRYPTO_LRW=m
635CONFIG_CRYPTO_PCBC=m 636CONFIG_CRYPTO_PCBC=m
636CONFIG_CRYPTO_XTS=m
637CONFIG_CRYPTO_KEYWRAP=m 637CONFIG_CRYPTO_KEYWRAP=m
638CONFIG_CRYPTO_XCBC=m 638CONFIG_CRYPTO_XCBC=m
639CONFIG_CRYPTO_VMAC=m 639CONFIG_CRYPTO_VMAC=m
@@ -657,7 +657,6 @@ CONFIG_CRYPTO_SEED=m
657CONFIG_CRYPTO_SERPENT=m 657CONFIG_CRYPTO_SERPENT=m
658CONFIG_CRYPTO_TEA=m 658CONFIG_CRYPTO_TEA=m
659CONFIG_CRYPTO_TWOFISH=m 659CONFIG_CRYPTO_TWOFISH=m
660CONFIG_CRYPTO_ZLIB=m
661CONFIG_CRYPTO_LZO=m 660CONFIG_CRYPTO_LZO=m
662CONFIG_CRYPTO_842=m 661CONFIG_CRYPTO_842=m
663CONFIG_CRYPTO_LZ4=m 662CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 07fc6abcfe0c..4304b3d56262 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-mvme147" 1CONFIG_LOCALVERSION="-mvme147"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -59,7 +58,6 @@ CONFIG_INET_IPCOMP=m
59CONFIG_INET_XFRM_MODE_TRANSPORT=m 58CONFIG_INET_XFRM_MODE_TRANSPORT=m
60CONFIG_INET_XFRM_MODE_TUNNEL=m 59CONFIG_INET_XFRM_MODE_TUNNEL=m
61CONFIG_INET_XFRM_MODE_BEET=m 60CONFIG_INET_XFRM_MODE_BEET=m
62# CONFIG_INET_LRO is not set
63CONFIG_INET_DIAG=m 61CONFIG_INET_DIAG=m
64CONFIG_INET_UDP_DIAG=m 62CONFIG_INET_UDP_DIAG=m
65CONFIG_IPV6=m 63CONFIG_IPV6=m
@@ -280,7 +278,9 @@ CONFIG_NET_MPLS_GSO=m
280CONFIG_MPLS_ROUTING=m 278CONFIG_MPLS_ROUTING=m
281CONFIG_MPLS_IPTUNNEL=m 279CONFIG_MPLS_IPTUNNEL=m
282CONFIG_NET_L3_MASTER_DEV=y 280CONFIG_NET_L3_MASTER_DEV=y
281CONFIG_AF_KCM=m
283# CONFIG_WIRELESS is not set 282# CONFIG_WIRELESS is not set
283CONFIG_NET_DEVLINK=m
284# CONFIG_UEVENT_HELPER is not set 284# CONFIG_UEVENT_HELPER is not set
285CONFIG_DEVTMPFS=y 285CONFIG_DEVTMPFS=y
286CONFIG_DEVTMPFS_MOUNT=y 286CONFIG_DEVTMPFS_MOUNT=y
@@ -339,6 +339,7 @@ CONFIG_MACVTAP=m
339CONFIG_IPVLAN=m 339CONFIG_IPVLAN=m
340CONFIG_VXLAN=m 340CONFIG_VXLAN=m
341CONFIG_GENEVE=m 341CONFIG_GENEVE=m
342CONFIG_MACSEC=m
342CONFIG_NETCONSOLE=m 343CONFIG_NETCONSOLE=m
343CONFIG_NETCONSOLE_DYNAMIC=y 344CONFIG_NETCONSOLE_DYNAMIC=y
344CONFIG_VETH=m 345CONFIG_VETH=m
@@ -403,6 +404,7 @@ CONFIG_JFS_FS=m
403CONFIG_XFS_FS=m 404CONFIG_XFS_FS=m
404CONFIG_OCFS2_FS=m 405CONFIG_OCFS2_FS=m
405# CONFIG_OCFS2_DEBUG_MASKLOG is not set 406# CONFIG_OCFS2_DEBUG_MASKLOG is not set
407CONFIG_FS_ENCRYPTION=m
406CONFIG_FANOTIFY=y 408CONFIG_FANOTIFY=y
407CONFIG_QUOTA_NETLINK_INTERFACE=y 409CONFIG_QUOTA_NETLINK_INTERFACE=y
408# CONFIG_PRINT_QUOTA_WARNING is not set 410# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -419,6 +421,7 @@ CONFIG_VFAT_FS=m
419CONFIG_PROC_KCORE=y 421CONFIG_PROC_KCORE=y
420CONFIG_PROC_CHILDREN=y 422CONFIG_PROC_CHILDREN=y
421CONFIG_TMPFS=y 423CONFIG_TMPFS=y
424CONFIG_ORANGEFS_FS=m
422CONFIG_AFFS_FS=m 425CONFIG_AFFS_FS=m
423CONFIG_ECRYPT_FS=m 426CONFIG_ECRYPT_FS=m
424CONFIG_ECRYPT_FS_MESSAGING=y 427CONFIG_ECRYPT_FS_MESSAGING=y
@@ -500,6 +503,7 @@ CONFIG_TEST_HEXDUMP=m
500CONFIG_TEST_STRING_HELPERS=m 503CONFIG_TEST_STRING_HELPERS=m
501CONFIG_TEST_KSTRTOX=m 504CONFIG_TEST_KSTRTOX=m
502CONFIG_TEST_PRINTF=m 505CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m
503CONFIG_TEST_RHASHTABLE=m 507CONFIG_TEST_RHASHTABLE=m
504CONFIG_TEST_LKM=m 508CONFIG_TEST_LKM=m
505CONFIG_TEST_USER_COPY=m 509CONFIG_TEST_USER_COPY=m
@@ -508,7 +512,6 @@ CONFIG_TEST_FIRMWARE=m
508CONFIG_TEST_UDELAY=m 512CONFIG_TEST_UDELAY=m
509CONFIG_TEST_STATIC_KEYS=m 513CONFIG_TEST_STATIC_KEYS=m
510CONFIG_EARLY_PRINTK=y 514CONFIG_EARLY_PRINTK=y
511CONFIG_ENCRYPTED_KEYS=m
512CONFIG_CRYPTO_RSA=m 515CONFIG_CRYPTO_RSA=m
513CONFIG_CRYPTO_MANAGER=y 516CONFIG_CRYPTO_MANAGER=y
514CONFIG_CRYPTO_USER=m 517CONFIG_CRYPTO_USER=m
@@ -516,12 +519,9 @@ CONFIG_CRYPTO_CRYPTD=m
516CONFIG_CRYPTO_MCRYPTD=m 519CONFIG_CRYPTO_MCRYPTD=m
517CONFIG_CRYPTO_TEST=m 520CONFIG_CRYPTO_TEST=m
518CONFIG_CRYPTO_CCM=m 521CONFIG_CRYPTO_CCM=m
519CONFIG_CRYPTO_GCM=m
520CONFIG_CRYPTO_CHACHA20POLY1305=m 522CONFIG_CRYPTO_CHACHA20POLY1305=m
521CONFIG_CRYPTO_CTS=m
522CONFIG_CRYPTO_LRW=m 523CONFIG_CRYPTO_LRW=m
523CONFIG_CRYPTO_PCBC=m 524CONFIG_CRYPTO_PCBC=m
524CONFIG_CRYPTO_XTS=m
525CONFIG_CRYPTO_KEYWRAP=m 525CONFIG_CRYPTO_KEYWRAP=m
526CONFIG_CRYPTO_XCBC=m 526CONFIG_CRYPTO_XCBC=m
527CONFIG_CRYPTO_VMAC=m 527CONFIG_CRYPTO_VMAC=m
@@ -545,7 +545,6 @@ CONFIG_CRYPTO_SEED=m
545CONFIG_CRYPTO_SERPENT=m 545CONFIG_CRYPTO_SERPENT=m
546CONFIG_CRYPTO_TEA=m 546CONFIG_CRYPTO_TEA=m
547CONFIG_CRYPTO_TWOFISH=m 547CONFIG_CRYPTO_TWOFISH=m
548CONFIG_CRYPTO_ZLIB=m
549CONFIG_CRYPTO_LZO=m 548CONFIG_CRYPTO_LZO=m
550CONFIG_CRYPTO_842=m 549CONFIG_CRYPTO_842=m
551CONFIG_CRYPTO_LZ4=m 550CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 69903ded88f7..074bda4094ff 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-mvme16x" 1CONFIG_LOCALVERSION="-mvme16x"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -60,7 +59,6 @@ CONFIG_INET_IPCOMP=m
60CONFIG_INET_XFRM_MODE_TRANSPORT=m 59CONFIG_INET_XFRM_MODE_TRANSPORT=m
61CONFIG_INET_XFRM_MODE_TUNNEL=m 60CONFIG_INET_XFRM_MODE_TUNNEL=m
62CONFIG_INET_XFRM_MODE_BEET=m 61CONFIG_INET_XFRM_MODE_BEET=m
63# CONFIG_INET_LRO is not set
64CONFIG_INET_DIAG=m 62CONFIG_INET_DIAG=m
65CONFIG_INET_UDP_DIAG=m 63CONFIG_INET_UDP_DIAG=m
66CONFIG_IPV6=m 64CONFIG_IPV6=m
@@ -281,7 +279,9 @@ CONFIG_NET_MPLS_GSO=m
281CONFIG_MPLS_ROUTING=m 279CONFIG_MPLS_ROUTING=m
282CONFIG_MPLS_IPTUNNEL=m 280CONFIG_MPLS_IPTUNNEL=m
283CONFIG_NET_L3_MASTER_DEV=y 281CONFIG_NET_L3_MASTER_DEV=y
282CONFIG_AF_KCM=m
284# CONFIG_WIRELESS is not set 283# CONFIG_WIRELESS is not set
284CONFIG_NET_DEVLINK=m
285# CONFIG_UEVENT_HELPER is not set 285# CONFIG_UEVENT_HELPER is not set
286CONFIG_DEVTMPFS=y 286CONFIG_DEVTMPFS=y
287CONFIG_DEVTMPFS_MOUNT=y 287CONFIG_DEVTMPFS_MOUNT=y
@@ -340,6 +340,7 @@ CONFIG_MACVTAP=m
340CONFIG_IPVLAN=m 340CONFIG_IPVLAN=m
341CONFIG_VXLAN=m 341CONFIG_VXLAN=m
342CONFIG_GENEVE=m 342CONFIG_GENEVE=m
343CONFIG_MACSEC=m
343CONFIG_NETCONSOLE=m 344CONFIG_NETCONSOLE=m
344CONFIG_NETCONSOLE_DYNAMIC=y 345CONFIG_NETCONSOLE_DYNAMIC=y
345CONFIG_VETH=m 346CONFIG_VETH=m
@@ -403,6 +404,7 @@ CONFIG_JFS_FS=m
403CONFIG_XFS_FS=m 404CONFIG_XFS_FS=m
404CONFIG_OCFS2_FS=m 405CONFIG_OCFS2_FS=m
405# CONFIG_OCFS2_DEBUG_MASKLOG is not set 406# CONFIG_OCFS2_DEBUG_MASKLOG is not set
407CONFIG_FS_ENCRYPTION=m
406CONFIG_FANOTIFY=y 408CONFIG_FANOTIFY=y
407CONFIG_QUOTA_NETLINK_INTERFACE=y 409CONFIG_QUOTA_NETLINK_INTERFACE=y
408# CONFIG_PRINT_QUOTA_WARNING is not set 410# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -419,6 +421,7 @@ CONFIG_VFAT_FS=m
419CONFIG_PROC_KCORE=y 421CONFIG_PROC_KCORE=y
420CONFIG_PROC_CHILDREN=y 422CONFIG_PROC_CHILDREN=y
421CONFIG_TMPFS=y 423CONFIG_TMPFS=y
424CONFIG_ORANGEFS_FS=m
422CONFIG_AFFS_FS=m 425CONFIG_AFFS_FS=m
423CONFIG_ECRYPT_FS=m 426CONFIG_ECRYPT_FS=m
424CONFIG_ECRYPT_FS_MESSAGING=y 427CONFIG_ECRYPT_FS_MESSAGING=y
@@ -500,6 +503,7 @@ CONFIG_TEST_HEXDUMP=m
500CONFIG_TEST_STRING_HELPERS=m 503CONFIG_TEST_STRING_HELPERS=m
501CONFIG_TEST_KSTRTOX=m 504CONFIG_TEST_KSTRTOX=m
502CONFIG_TEST_PRINTF=m 505CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m
503CONFIG_TEST_RHASHTABLE=m 507CONFIG_TEST_RHASHTABLE=m
504CONFIG_TEST_LKM=m 508CONFIG_TEST_LKM=m
505CONFIG_TEST_USER_COPY=m 509CONFIG_TEST_USER_COPY=m
@@ -508,7 +512,6 @@ CONFIG_TEST_FIRMWARE=m
508CONFIG_TEST_UDELAY=m 512CONFIG_TEST_UDELAY=m
509CONFIG_TEST_STATIC_KEYS=m 513CONFIG_TEST_STATIC_KEYS=m
510CONFIG_EARLY_PRINTK=y 514CONFIG_EARLY_PRINTK=y
511CONFIG_ENCRYPTED_KEYS=m
512CONFIG_CRYPTO_RSA=m 515CONFIG_CRYPTO_RSA=m
513CONFIG_CRYPTO_MANAGER=y 516CONFIG_CRYPTO_MANAGER=y
514CONFIG_CRYPTO_USER=m 517CONFIG_CRYPTO_USER=m
@@ -516,12 +519,9 @@ CONFIG_CRYPTO_CRYPTD=m
516CONFIG_CRYPTO_MCRYPTD=m 519CONFIG_CRYPTO_MCRYPTD=m
517CONFIG_CRYPTO_TEST=m 520CONFIG_CRYPTO_TEST=m
518CONFIG_CRYPTO_CCM=m 521CONFIG_CRYPTO_CCM=m
519CONFIG_CRYPTO_GCM=m
520CONFIG_CRYPTO_CHACHA20POLY1305=m 522CONFIG_CRYPTO_CHACHA20POLY1305=m
521CONFIG_CRYPTO_CTS=m
522CONFIG_CRYPTO_LRW=m 523CONFIG_CRYPTO_LRW=m
523CONFIG_CRYPTO_PCBC=m 524CONFIG_CRYPTO_PCBC=m
524CONFIG_CRYPTO_XTS=m
525CONFIG_CRYPTO_KEYWRAP=m 525CONFIG_CRYPTO_KEYWRAP=m
526CONFIG_CRYPTO_XCBC=m 526CONFIG_CRYPTO_XCBC=m
527CONFIG_CRYPTO_VMAC=m 527CONFIG_CRYPTO_VMAC=m
@@ -545,7 +545,6 @@ CONFIG_CRYPTO_SEED=m
545CONFIG_CRYPTO_SERPENT=m 545CONFIG_CRYPTO_SERPENT=m
546CONFIG_CRYPTO_TEA=m 546CONFIG_CRYPTO_TEA=m
547CONFIG_CRYPTO_TWOFISH=m 547CONFIG_CRYPTO_TWOFISH=m
548CONFIG_CRYPTO_ZLIB=m
549CONFIG_CRYPTO_LZO=m 548CONFIG_CRYPTO_LZO=m
550CONFIG_CRYPTO_842=m 549CONFIG_CRYPTO_842=m
551CONFIG_CRYPTO_LZ4=m 550CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index bd8401686dde..07b9fa8d7f2e 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-q40" 1CONFIG_LOCALVERSION="-q40"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -60,7 +59,6 @@ CONFIG_INET_IPCOMP=m
60CONFIG_INET_XFRM_MODE_TRANSPORT=m 59CONFIG_INET_XFRM_MODE_TRANSPORT=m
61CONFIG_INET_XFRM_MODE_TUNNEL=m 60CONFIG_INET_XFRM_MODE_TUNNEL=m
62CONFIG_INET_XFRM_MODE_BEET=m 61CONFIG_INET_XFRM_MODE_BEET=m
63# CONFIG_INET_LRO is not set
64CONFIG_INET_DIAG=m 62CONFIG_INET_DIAG=m
65CONFIG_INET_UDP_DIAG=m 63CONFIG_INET_UDP_DIAG=m
66CONFIG_IPV6=m 64CONFIG_IPV6=m
@@ -281,7 +279,9 @@ CONFIG_NET_MPLS_GSO=m
281CONFIG_MPLS_ROUTING=m 279CONFIG_MPLS_ROUTING=m
282CONFIG_MPLS_IPTUNNEL=m 280CONFIG_MPLS_IPTUNNEL=m
283CONFIG_NET_L3_MASTER_DEV=y 281CONFIG_NET_L3_MASTER_DEV=y
282CONFIG_AF_KCM=m
284# CONFIG_WIRELESS is not set 283# CONFIG_WIRELESS is not set
284CONFIG_NET_DEVLINK=m
285# CONFIG_UEVENT_HELPER is not set 285# CONFIG_UEVENT_HELPER is not set
286CONFIG_DEVTMPFS=y 286CONFIG_DEVTMPFS=y
287CONFIG_DEVTMPFS_MOUNT=y 287CONFIG_DEVTMPFS_MOUNT=y
@@ -346,6 +346,7 @@ CONFIG_MACVTAP=m
346CONFIG_IPVLAN=m 346CONFIG_IPVLAN=m
347CONFIG_VXLAN=m 347CONFIG_VXLAN=m
348CONFIG_GENEVE=m 348CONFIG_GENEVE=m
349CONFIG_MACSEC=m
349CONFIG_NETCONSOLE=m 350CONFIG_NETCONSOLE=m
350CONFIG_NETCONSOLE_DYNAMIC=y 351CONFIG_NETCONSOLE_DYNAMIC=y
351CONFIG_VETH=m 352CONFIG_VETH=m
@@ -426,6 +427,7 @@ CONFIG_JFS_FS=m
426CONFIG_XFS_FS=m 427CONFIG_XFS_FS=m
427CONFIG_OCFS2_FS=m 428CONFIG_OCFS2_FS=m
428# CONFIG_OCFS2_DEBUG_MASKLOG is not set 429# CONFIG_OCFS2_DEBUG_MASKLOG is not set
430CONFIG_FS_ENCRYPTION=m
429CONFIG_FANOTIFY=y 431CONFIG_FANOTIFY=y
430CONFIG_QUOTA_NETLINK_INTERFACE=y 432CONFIG_QUOTA_NETLINK_INTERFACE=y
431# CONFIG_PRINT_QUOTA_WARNING is not set 433# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -442,6 +444,7 @@ CONFIG_VFAT_FS=m
442CONFIG_PROC_KCORE=y 444CONFIG_PROC_KCORE=y
443CONFIG_PROC_CHILDREN=y 445CONFIG_PROC_CHILDREN=y
444CONFIG_TMPFS=y 446CONFIG_TMPFS=y
447CONFIG_ORANGEFS_FS=m
445CONFIG_AFFS_FS=m 448CONFIG_AFFS_FS=m
446CONFIG_ECRYPT_FS=m 449CONFIG_ECRYPT_FS=m
447CONFIG_ECRYPT_FS_MESSAGING=y 450CONFIG_ECRYPT_FS_MESSAGING=y
@@ -523,6 +526,7 @@ CONFIG_TEST_HEXDUMP=m
523CONFIG_TEST_STRING_HELPERS=m 526CONFIG_TEST_STRING_HELPERS=m
524CONFIG_TEST_KSTRTOX=m 527CONFIG_TEST_KSTRTOX=m
525CONFIG_TEST_PRINTF=m 528CONFIG_TEST_PRINTF=m
529CONFIG_TEST_BITMAP=m
526CONFIG_TEST_RHASHTABLE=m 530CONFIG_TEST_RHASHTABLE=m
527CONFIG_TEST_LKM=m 531CONFIG_TEST_LKM=m
528CONFIG_TEST_USER_COPY=m 532CONFIG_TEST_USER_COPY=m
@@ -531,7 +535,6 @@ CONFIG_TEST_FIRMWARE=m
531CONFIG_TEST_UDELAY=m 535CONFIG_TEST_UDELAY=m
532CONFIG_TEST_STATIC_KEYS=m 536CONFIG_TEST_STATIC_KEYS=m
533CONFIG_EARLY_PRINTK=y 537CONFIG_EARLY_PRINTK=y
534CONFIG_ENCRYPTED_KEYS=m
535CONFIG_CRYPTO_RSA=m 538CONFIG_CRYPTO_RSA=m
536CONFIG_CRYPTO_MANAGER=y 539CONFIG_CRYPTO_MANAGER=y
537CONFIG_CRYPTO_USER=m 540CONFIG_CRYPTO_USER=m
@@ -539,12 +542,9 @@ CONFIG_CRYPTO_CRYPTD=m
539CONFIG_CRYPTO_MCRYPTD=m 542CONFIG_CRYPTO_MCRYPTD=m
540CONFIG_CRYPTO_TEST=m 543CONFIG_CRYPTO_TEST=m
541CONFIG_CRYPTO_CCM=m 544CONFIG_CRYPTO_CCM=m
542CONFIG_CRYPTO_GCM=m
543CONFIG_CRYPTO_CHACHA20POLY1305=m 545CONFIG_CRYPTO_CHACHA20POLY1305=m
544CONFIG_CRYPTO_CTS=m
545CONFIG_CRYPTO_LRW=m 546CONFIG_CRYPTO_LRW=m
546CONFIG_CRYPTO_PCBC=m 547CONFIG_CRYPTO_PCBC=m
547CONFIG_CRYPTO_XTS=m
548CONFIG_CRYPTO_KEYWRAP=m 548CONFIG_CRYPTO_KEYWRAP=m
549CONFIG_CRYPTO_XCBC=m 549CONFIG_CRYPTO_XCBC=m
550CONFIG_CRYPTO_VMAC=m 550CONFIG_CRYPTO_VMAC=m
@@ -568,7 +568,6 @@ CONFIG_CRYPTO_SEED=m
568CONFIG_CRYPTO_SERPENT=m 568CONFIG_CRYPTO_SERPENT=m
569CONFIG_CRYPTO_TEA=m 569CONFIG_CRYPTO_TEA=m
570CONFIG_CRYPTO_TWOFISH=m 570CONFIG_CRYPTO_TWOFISH=m
571CONFIG_CRYPTO_ZLIB=m
572CONFIG_CRYPTO_LZO=m 571CONFIG_CRYPTO_LZO=m
573CONFIG_CRYPTO_842=m 572CONFIG_CRYPTO_842=m
574CONFIG_CRYPTO_LZ4=m 573CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 5f9fb3ab9636..36e6fae02d45 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-sun3" 1CONFIG_LOCALVERSION="-sun3"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -57,7 +56,6 @@ CONFIG_INET_IPCOMP=m
57CONFIG_INET_XFRM_MODE_TRANSPORT=m 56CONFIG_INET_XFRM_MODE_TRANSPORT=m
58CONFIG_INET_XFRM_MODE_TUNNEL=m 57CONFIG_INET_XFRM_MODE_TUNNEL=m
59CONFIG_INET_XFRM_MODE_BEET=m 58CONFIG_INET_XFRM_MODE_BEET=m
60# CONFIG_INET_LRO is not set
61CONFIG_INET_DIAG=m 59CONFIG_INET_DIAG=m
62CONFIG_INET_UDP_DIAG=m 60CONFIG_INET_UDP_DIAG=m
63CONFIG_IPV6=m 61CONFIG_IPV6=m
@@ -278,7 +276,9 @@ CONFIG_NET_MPLS_GSO=m
278CONFIG_MPLS_ROUTING=m 276CONFIG_MPLS_ROUTING=m
279CONFIG_MPLS_IPTUNNEL=m 277CONFIG_MPLS_IPTUNNEL=m
280CONFIG_NET_L3_MASTER_DEV=y 278CONFIG_NET_L3_MASTER_DEV=y
279CONFIG_AF_KCM=m
281# CONFIG_WIRELESS is not set 280# CONFIG_WIRELESS is not set
281CONFIG_NET_DEVLINK=m
282# CONFIG_UEVENT_HELPER is not set 282# CONFIG_UEVENT_HELPER is not set
283CONFIG_DEVTMPFS=y 283CONFIG_DEVTMPFS=y
284CONFIG_DEVTMPFS_MOUNT=y 284CONFIG_DEVTMPFS_MOUNT=y
@@ -337,6 +337,7 @@ CONFIG_MACVTAP=m
337CONFIG_IPVLAN=m 337CONFIG_IPVLAN=m
338CONFIG_VXLAN=m 338CONFIG_VXLAN=m
339CONFIG_GENEVE=m 339CONFIG_GENEVE=m
340CONFIG_MACSEC=m
340CONFIG_NETCONSOLE=m 341CONFIG_NETCONSOLE=m
341CONFIG_NETCONSOLE_DYNAMIC=y 342CONFIG_NETCONSOLE_DYNAMIC=y
342CONFIG_VETH=m 343CONFIG_VETH=m
@@ -405,6 +406,7 @@ CONFIG_JFS_FS=m
405CONFIG_XFS_FS=m 406CONFIG_XFS_FS=m
406CONFIG_OCFS2_FS=m 407CONFIG_OCFS2_FS=m
407# CONFIG_OCFS2_DEBUG_MASKLOG is not set 408# CONFIG_OCFS2_DEBUG_MASKLOG is not set
409CONFIG_FS_ENCRYPTION=m
408CONFIG_FANOTIFY=y 410CONFIG_FANOTIFY=y
409CONFIG_QUOTA_NETLINK_INTERFACE=y 411CONFIG_QUOTA_NETLINK_INTERFACE=y
410# CONFIG_PRINT_QUOTA_WARNING is not set 412# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -421,6 +423,7 @@ CONFIG_VFAT_FS=m
421CONFIG_PROC_KCORE=y 423CONFIG_PROC_KCORE=y
422CONFIG_PROC_CHILDREN=y 424CONFIG_PROC_CHILDREN=y
423CONFIG_TMPFS=y 425CONFIG_TMPFS=y
426CONFIG_ORANGEFS_FS=m
424CONFIG_AFFS_FS=m 427CONFIG_AFFS_FS=m
425CONFIG_ECRYPT_FS=m 428CONFIG_ECRYPT_FS=m
426CONFIG_ECRYPT_FS_MESSAGING=y 429CONFIG_ECRYPT_FS_MESSAGING=y
@@ -502,6 +505,7 @@ CONFIG_TEST_HEXDUMP=m
502CONFIG_TEST_STRING_HELPERS=m 505CONFIG_TEST_STRING_HELPERS=m
503CONFIG_TEST_KSTRTOX=m 506CONFIG_TEST_KSTRTOX=m
504CONFIG_TEST_PRINTF=m 507CONFIG_TEST_PRINTF=m
508CONFIG_TEST_BITMAP=m
505CONFIG_TEST_RHASHTABLE=m 509CONFIG_TEST_RHASHTABLE=m
506CONFIG_TEST_LKM=m 510CONFIG_TEST_LKM=m
507CONFIG_TEST_USER_COPY=m 511CONFIG_TEST_USER_COPY=m
@@ -509,7 +513,6 @@ CONFIG_TEST_BPF=m
509CONFIG_TEST_FIRMWARE=m 513CONFIG_TEST_FIRMWARE=m
510CONFIG_TEST_UDELAY=m 514CONFIG_TEST_UDELAY=m
511CONFIG_TEST_STATIC_KEYS=m 515CONFIG_TEST_STATIC_KEYS=m
512CONFIG_ENCRYPTED_KEYS=m
513CONFIG_CRYPTO_RSA=m 516CONFIG_CRYPTO_RSA=m
514CONFIG_CRYPTO_MANAGER=y 517CONFIG_CRYPTO_MANAGER=y
515CONFIG_CRYPTO_USER=m 518CONFIG_CRYPTO_USER=m
@@ -517,12 +520,9 @@ CONFIG_CRYPTO_CRYPTD=m
517CONFIG_CRYPTO_MCRYPTD=m 520CONFIG_CRYPTO_MCRYPTD=m
518CONFIG_CRYPTO_TEST=m 521CONFIG_CRYPTO_TEST=m
519CONFIG_CRYPTO_CCM=m 522CONFIG_CRYPTO_CCM=m
520CONFIG_CRYPTO_GCM=m
521CONFIG_CRYPTO_CHACHA20POLY1305=m 523CONFIG_CRYPTO_CHACHA20POLY1305=m
522CONFIG_CRYPTO_CTS=m
523CONFIG_CRYPTO_LRW=m 524CONFIG_CRYPTO_LRW=m
524CONFIG_CRYPTO_PCBC=m 525CONFIG_CRYPTO_PCBC=m
525CONFIG_CRYPTO_XTS=m
526CONFIG_CRYPTO_KEYWRAP=m 526CONFIG_CRYPTO_KEYWRAP=m
527CONFIG_CRYPTO_XCBC=m 527CONFIG_CRYPTO_XCBC=m
528CONFIG_CRYPTO_VMAC=m 528CONFIG_CRYPTO_VMAC=m
@@ -546,7 +546,6 @@ CONFIG_CRYPTO_SEED=m
546CONFIG_CRYPTO_SERPENT=m 546CONFIG_CRYPTO_SERPENT=m
547CONFIG_CRYPTO_TEA=m 547CONFIG_CRYPTO_TEA=m
548CONFIG_CRYPTO_TWOFISH=m 548CONFIG_CRYPTO_TWOFISH=m
549CONFIG_CRYPTO_ZLIB=m
550CONFIG_CRYPTO_LZO=m 549CONFIG_CRYPTO_LZO=m
551CONFIG_CRYPTO_842=m 550CONFIG_CRYPTO_842=m
552CONFIG_CRYPTO_LZ4=m 551CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 5d1c674530e2..903acf929511 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -1,7 +1,6 @@
1CONFIG_LOCALVERSION="-sun3x" 1CONFIG_LOCALVERSION="-sun3x"
2CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
3CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
4CONFIG_FHANDLE=y
5CONFIG_BSD_PROCESS_ACCT=y 4CONFIG_BSD_PROCESS_ACCT=y
6CONFIG_BSD_PROCESS_ACCT_V3=y 5CONFIG_BSD_PROCESS_ACCT_V3=y
7CONFIG_LOG_BUF_SHIFT=16 6CONFIG_LOG_BUF_SHIFT=16
@@ -57,7 +56,6 @@ CONFIG_INET_IPCOMP=m
57CONFIG_INET_XFRM_MODE_TRANSPORT=m 56CONFIG_INET_XFRM_MODE_TRANSPORT=m
58CONFIG_INET_XFRM_MODE_TUNNEL=m 57CONFIG_INET_XFRM_MODE_TUNNEL=m
59CONFIG_INET_XFRM_MODE_BEET=m 58CONFIG_INET_XFRM_MODE_BEET=m
60# CONFIG_INET_LRO is not set
61CONFIG_INET_DIAG=m 59CONFIG_INET_DIAG=m
62CONFIG_INET_UDP_DIAG=m 60CONFIG_INET_UDP_DIAG=m
63CONFIG_IPV6=m 61CONFIG_IPV6=m
@@ -278,7 +276,9 @@ CONFIG_NET_MPLS_GSO=m
278CONFIG_MPLS_ROUTING=m 276CONFIG_MPLS_ROUTING=m
279CONFIG_MPLS_IPTUNNEL=m 277CONFIG_MPLS_IPTUNNEL=m
280CONFIG_NET_L3_MASTER_DEV=y 278CONFIG_NET_L3_MASTER_DEV=y
279CONFIG_AF_KCM=m
281# CONFIG_WIRELESS is not set 280# CONFIG_WIRELESS is not set
281CONFIG_NET_DEVLINK=m
282# CONFIG_UEVENT_HELPER is not set 282# CONFIG_UEVENT_HELPER is not set
283CONFIG_DEVTMPFS=y 283CONFIG_DEVTMPFS=y
284CONFIG_DEVTMPFS_MOUNT=y 284CONFIG_DEVTMPFS_MOUNT=y
@@ -337,6 +337,7 @@ CONFIG_MACVTAP=m
337CONFIG_IPVLAN=m 337CONFIG_IPVLAN=m
338CONFIG_VXLAN=m 338CONFIG_VXLAN=m
339CONFIG_GENEVE=m 339CONFIG_GENEVE=m
340CONFIG_MACSEC=m
340CONFIG_NETCONSOLE=m 341CONFIG_NETCONSOLE=m
341CONFIG_NETCONSOLE_DYNAMIC=y 342CONFIG_NETCONSOLE_DYNAMIC=y
342CONFIG_VETH=m 343CONFIG_VETH=m
@@ -405,6 +406,7 @@ CONFIG_JFS_FS=m
405CONFIG_XFS_FS=m 406CONFIG_XFS_FS=m
406CONFIG_OCFS2_FS=m 407CONFIG_OCFS2_FS=m
407# CONFIG_OCFS2_DEBUG_MASKLOG is not set 408# CONFIG_OCFS2_DEBUG_MASKLOG is not set
409CONFIG_FS_ENCRYPTION=m
408CONFIG_FANOTIFY=y 410CONFIG_FANOTIFY=y
409CONFIG_QUOTA_NETLINK_INTERFACE=y 411CONFIG_QUOTA_NETLINK_INTERFACE=y
410# CONFIG_PRINT_QUOTA_WARNING is not set 412# CONFIG_PRINT_QUOTA_WARNING is not set
@@ -421,6 +423,7 @@ CONFIG_VFAT_FS=m
421CONFIG_PROC_KCORE=y 423CONFIG_PROC_KCORE=y
422CONFIG_PROC_CHILDREN=y 424CONFIG_PROC_CHILDREN=y
423CONFIG_TMPFS=y 425CONFIG_TMPFS=y
426CONFIG_ORANGEFS_FS=m
424CONFIG_AFFS_FS=m 427CONFIG_AFFS_FS=m
425CONFIG_ECRYPT_FS=m 428CONFIG_ECRYPT_FS=m
426CONFIG_ECRYPT_FS_MESSAGING=y 429CONFIG_ECRYPT_FS_MESSAGING=y
@@ -502,6 +505,7 @@ CONFIG_TEST_HEXDUMP=m
502CONFIG_TEST_STRING_HELPERS=m 505CONFIG_TEST_STRING_HELPERS=m
503CONFIG_TEST_KSTRTOX=m 506CONFIG_TEST_KSTRTOX=m
504CONFIG_TEST_PRINTF=m 507CONFIG_TEST_PRINTF=m
508CONFIG_TEST_BITMAP=m
505CONFIG_TEST_RHASHTABLE=m 509CONFIG_TEST_RHASHTABLE=m
506CONFIG_TEST_LKM=m 510CONFIG_TEST_LKM=m
507CONFIG_TEST_USER_COPY=m 511CONFIG_TEST_USER_COPY=m
@@ -510,7 +514,6 @@ CONFIG_TEST_FIRMWARE=m
510CONFIG_TEST_UDELAY=m 514CONFIG_TEST_UDELAY=m
511CONFIG_TEST_STATIC_KEYS=m 515CONFIG_TEST_STATIC_KEYS=m
512CONFIG_EARLY_PRINTK=y 516CONFIG_EARLY_PRINTK=y
513CONFIG_ENCRYPTED_KEYS=m
514CONFIG_CRYPTO_RSA=m 517CONFIG_CRYPTO_RSA=m
515CONFIG_CRYPTO_MANAGER=y 518CONFIG_CRYPTO_MANAGER=y
516CONFIG_CRYPTO_USER=m 519CONFIG_CRYPTO_USER=m
@@ -518,12 +521,9 @@ CONFIG_CRYPTO_CRYPTD=m
518CONFIG_CRYPTO_MCRYPTD=m 521CONFIG_CRYPTO_MCRYPTD=m
519CONFIG_CRYPTO_TEST=m 522CONFIG_CRYPTO_TEST=m
520CONFIG_CRYPTO_CCM=m 523CONFIG_CRYPTO_CCM=m
521CONFIG_CRYPTO_GCM=m
522CONFIG_CRYPTO_CHACHA20POLY1305=m 524CONFIG_CRYPTO_CHACHA20POLY1305=m
523CONFIG_CRYPTO_CTS=m
524CONFIG_CRYPTO_LRW=m 525CONFIG_CRYPTO_LRW=m
525CONFIG_CRYPTO_PCBC=m 526CONFIG_CRYPTO_PCBC=m
526CONFIG_CRYPTO_XTS=m
527CONFIG_CRYPTO_KEYWRAP=m 527CONFIG_CRYPTO_KEYWRAP=m
528CONFIG_CRYPTO_XCBC=m 528CONFIG_CRYPTO_XCBC=m
529CONFIG_CRYPTO_VMAC=m 529CONFIG_CRYPTO_VMAC=m
@@ -547,7 +547,6 @@ CONFIG_CRYPTO_SEED=m
547CONFIG_CRYPTO_SERPENT=m 547CONFIG_CRYPTO_SERPENT=m
548CONFIG_CRYPTO_TEA=m 548CONFIG_CRYPTO_TEA=m
549CONFIG_CRYPTO_TWOFISH=m 549CONFIG_CRYPTO_TWOFISH=m
550CONFIG_CRYPTO_ZLIB=m
551CONFIG_CRYPTO_LZO=m 550CONFIG_CRYPTO_LZO=m
552CONFIG_CRYPTO_842=m 551CONFIG_CRYPTO_842=m
553CONFIG_CRYPTO_LZ4=m 552CONFIG_CRYPTO_LZ4=m
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index bafaff6dcd7b..a857d82ec509 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -4,7 +4,7 @@
4#include <uapi/asm/unistd.h> 4#include <uapi/asm/unistd.h>
5 5
6 6
7#define NR_syscalls 377 7#define NR_syscalls 379
8 8
9#define __ARCH_WANT_OLD_READDIR 9#define __ARCH_WANT_OLD_READDIR
10#define __ARCH_WANT_OLD_STAT 10#define __ARCH_WANT_OLD_STAT
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h
index 0ca729665f29..9fe674bf911f 100644
--- a/arch/m68k/include/uapi/asm/unistd.h
+++ b/arch/m68k/include/uapi/asm/unistd.h
@@ -382,5 +382,7 @@
382#define __NR_membarrier 374 382#define __NR_membarrier 374
383#define __NR_mlock2 375 383#define __NR_mlock2 375
384#define __NR_copy_file_range 376 384#define __NR_copy_file_range 376
385#define __NR_preadv2 377
386#define __NR_pwritev2 378
385 387
386#endif /* _UAPI_ASM_M68K_UNISTD_H_ */ 388#endif /* _UAPI_ASM_M68K_UNISTD_H_ */
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 8bb94261ff97..d6fd6d9ced24 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -397,3 +397,5 @@ ENTRY(sys_call_table)
397 .long sys_membarrier 397 .long sys_membarrier
398 .long sys_mlock2 /* 375 */ 398 .long sys_mlock2 /* 375 */
399 .long sys_copy_file_range 399 .long sys_copy_file_range
400 .long sys_preadv2
401 .long sys_pwritev2
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-05 18:52:10 -0400