Skip to content

Commit d3e68ce

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v4.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - build warning fix - defconfig updates - wire up new statx syscall * tag 'm68k-for-v4.11-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Wire up statx m68k/defconfig: Update defconfigs for v4.11-rc1 m68k/bitops: Correct signature of test_bit()
2 parents c02ed2e + e3b1ebd commit d3e68ce

File tree

16 files changed

+160
-14
lines changed

16 files changed

+160
-14
lines changed

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CONFIG_SUN_PARTITION=y
2525
# CONFIG_EFI_PARTITION is not set
2626
CONFIG_SYSV68_PARTITION=y
2727
CONFIG_IOSCHED_DEADLINE=m
28+
CONFIG_MQ_IOSCHED_DEADLINE=m
2829
CONFIG_KEXEC=y
2930
CONFIG_BOOTINFO_PROC=y
3031
CONFIG_M68020=y
@@ -60,6 +61,7 @@ CONFIG_NET_IPVTI=m
6061
CONFIG_NET_FOU_IP_TUNNELS=y
6162
CONFIG_INET_AH=m
6263
CONFIG_INET_ESP=m
64+
CONFIG_INET_ESP_OFFLOAD=m
6365
CONFIG_INET_IPCOMP=m
6466
CONFIG_INET_XFRM_MODE_TRANSPORT=m
6567
CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -71,6 +73,7 @@ CONFIG_IPV6=m
7173
CONFIG_IPV6_ROUTER_PREF=y
7274
CONFIG_INET6_AH=m
7375
CONFIG_INET6_ESP=m
76+
CONFIG_INET6_ESP_OFFLOAD=m
7477
CONFIG_INET6_IPCOMP=m
7578
CONFIG_IPV6_ILA=m
7679
CONFIG_IPV6_VTI=m
@@ -101,6 +104,7 @@ CONFIG_NFT_NUMGEN=m
101104
CONFIG_NFT_CT=m
102105
CONFIG_NFT_SET_RBTREE=m
103106
CONFIG_NFT_SET_HASH=m
107+
CONFIG_NFT_SET_BITMAP=m
104108
CONFIG_NFT_COUNTER=m
105109
CONFIG_NFT_LOG=m
106110
CONFIG_NFT_LIMIT=m
@@ -298,6 +302,8 @@ CONFIG_MPLS_IPTUNNEL=m
298302
CONFIG_NET_L3_MASTER_DEV=y
299303
CONFIG_AF_KCM=m
300304
# CONFIG_WIRELESS is not set
305+
CONFIG_PSAMPLE=m
306+
CONFIG_NET_IFE=m
301307
CONFIG_NET_DEVLINK=m
302308
# CONFIG_UEVENT_HELPER is not set
303309
CONFIG_DEVTMPFS=y
@@ -371,6 +377,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
371377
CONFIG_MACVLAN=m
372378
CONFIG_MACVTAP=m
373379
CONFIG_IPVLAN=m
380+
CONFIG_IPVTAP=m
374381
CONFIG_VXLAN=m
375382
CONFIG_GENEVE=m
376383
CONFIG_GTP=m
@@ -383,6 +390,7 @@ CONFIG_VETH=m
383390
# CONFIG_NET_VENDOR_AMAZON is not set
384391
CONFIG_A2065=y
385392
CONFIG_ARIADNE=y
393+
# CONFIG_NET_VENDOR_AQUANTIA is not set
386394
# CONFIG_NET_VENDOR_ARC is not set
387395
# CONFIG_NET_CADENCE is not set
388396
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -404,7 +412,6 @@ CONFIG_ZORRO8390=y
404412
# CONFIG_NET_VENDOR_SOLARFLARE is not set
405413
# CONFIG_NET_VENDOR_SMSC is not set
406414
# CONFIG_NET_VENDOR_STMICRO is not set
407-
# CONFIG_NET_VENDOR_SYNOPSYS is not set
408415
# CONFIG_NET_VENDOR_VIA is not set
409416
# CONFIG_NET_VENDOR_WIZNET is not set
410417
CONFIG_PPP=m
@@ -564,6 +571,8 @@ CONFIG_NLS_MAC_TURKISH=m
564571
CONFIG_DLM=m
565572
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
566573
CONFIG_MAGIC_SYSRQ=y
574+
CONFIG_WW_MUTEX_SELFTEST=m
575+
CONFIG_ATOMIC64_SELFTEST=m
567576
CONFIG_ASYNC_RAID6_TEST=m
568577
CONFIG_TEST_HEXDUMP=m
569578
CONFIG_TEST_STRING_HELPERS=m
@@ -594,6 +603,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m
594603
CONFIG_CRYPTO_LRW=m
595604
CONFIG_CRYPTO_PCBC=m
596605
CONFIG_CRYPTO_KEYWRAP=m
606+
CONFIG_CRYPTO_CMAC=m
597607
CONFIG_CRYPTO_XCBC=m
598608
CONFIG_CRYPTO_VMAC=m
599609
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -605,6 +615,7 @@ CONFIG_CRYPTO_SHA512=m
605615
CONFIG_CRYPTO_SHA3=m
606616
CONFIG_CRYPTO_TGR192=m
607617
CONFIG_CRYPTO_WP512=m
618+
CONFIG_CRYPTO_AES_TI=m
608619
CONFIG_CRYPTO_ANUBIS=m
609620
CONFIG_CRYPTO_BLOWFISH=m
610621
CONFIG_CRYPTO_CAMELLIA=m
@@ -629,4 +640,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
629640
CONFIG_CRYPTO_USER_API_RNG=m
630641
CONFIG_CRYPTO_USER_API_AEAD=m
631642
# CONFIG_CRYPTO_HW is not set
643+
CONFIG_CRC32_SELFTEST=m
632644
CONFIG_XZ_DEC_TEST=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CONFIG_SUN_PARTITION=y
2626
# CONFIG_EFI_PARTITION is not set
2727
CONFIG_SYSV68_PARTITION=y
2828
CONFIG_IOSCHED_DEADLINE=m
29+
CONFIG_MQ_IOSCHED_DEADLINE=m
2930
CONFIG_KEXEC=y
3031
CONFIG_BOOTINFO_PROC=y
3132
CONFIG_M68020=y
@@ -58,6 +59,7 @@ CONFIG_NET_IPVTI=m
5859
CONFIG_NET_FOU_IP_TUNNELS=y
5960
CONFIG_INET_AH=m
6061
CONFIG_INET_ESP=m
62+
CONFIG_INET_ESP_OFFLOAD=m
6163
CONFIG_INET_IPCOMP=m
6264
CONFIG_INET_XFRM_MODE_TRANSPORT=m
6365
CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -69,6 +71,7 @@ CONFIG_IPV6=m
6971
CONFIG_IPV6_ROUTER_PREF=y
7072
CONFIG_INET6_AH=m
7173
CONFIG_INET6_ESP=m
74+
CONFIG_INET6_ESP_OFFLOAD=m
7275
CONFIG_INET6_IPCOMP=m
7376
CONFIG_IPV6_ILA=m
7477
CONFIG_IPV6_VTI=m
@@ -99,6 +102,7 @@ CONFIG_NFT_NUMGEN=m
99102
CONFIG_NFT_CT=m
100103
CONFIG_NFT_SET_RBTREE=m
101104
CONFIG_NFT_SET_HASH=m
105+
CONFIG_NFT_SET_BITMAP=m
102106
CONFIG_NFT_COUNTER=m
103107
CONFIG_NFT_LOG=m
104108
CONFIG_NFT_LIMIT=m
@@ -296,6 +300,8 @@ CONFIG_MPLS_IPTUNNEL=m
296300
CONFIG_NET_L3_MASTER_DEV=y
297301
CONFIG_AF_KCM=m
298302
# CONFIG_WIRELESS is not set
303+
CONFIG_PSAMPLE=m
304+
CONFIG_NET_IFE=m
299305
CONFIG_NET_DEVLINK=m
300306
# CONFIG_UEVENT_HELPER is not set
301307
CONFIG_DEVTMPFS=y
@@ -353,6 +359,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
353359
CONFIG_MACVLAN=m
354360
CONFIG_MACVTAP=m
355361
CONFIG_IPVLAN=m
362+
CONFIG_IPVTAP=m
356363
CONFIG_VXLAN=m
357364
CONFIG_GENEVE=m
358365
CONFIG_GTP=m
@@ -362,6 +369,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
362369
CONFIG_VETH=m
363370
# CONFIG_NET_VENDOR_ALACRITECH is not set
364371
# CONFIG_NET_VENDOR_AMAZON is not set
372+
# CONFIG_NET_VENDOR_AQUANTIA is not set
365373
# CONFIG_NET_VENDOR_ARC is not set
366374
# CONFIG_NET_CADENCE is not set
367375
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -378,7 +386,6 @@ CONFIG_VETH=m
378386
# CONFIG_NET_VENDOR_SEEQ is not set
379387
# CONFIG_NET_VENDOR_SOLARFLARE is not set
380388
# CONFIG_NET_VENDOR_STMICRO is not set
381-
# CONFIG_NET_VENDOR_SYNOPSYS is not set
382389
# CONFIG_NET_VENDOR_VIA is not set
383390
# CONFIG_NET_VENDOR_WIZNET is not set
384391
CONFIG_PPP=m
@@ -523,6 +530,8 @@ CONFIG_NLS_MAC_TURKISH=m
523530
CONFIG_DLM=m
524531
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
525532
CONFIG_MAGIC_SYSRQ=y
533+
CONFIG_WW_MUTEX_SELFTEST=m
534+
CONFIG_ATOMIC64_SELFTEST=m
526535
CONFIG_ASYNC_RAID6_TEST=m
527536
CONFIG_TEST_HEXDUMP=m
528537
CONFIG_TEST_STRING_HELPERS=m
@@ -553,6 +562,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m
553562
CONFIG_CRYPTO_LRW=m
554563
CONFIG_CRYPTO_PCBC=m
555564
CONFIG_CRYPTO_KEYWRAP=m
565+
CONFIG_CRYPTO_CMAC=m
556566
CONFIG_CRYPTO_XCBC=m
557567
CONFIG_CRYPTO_VMAC=m
558568
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -564,6 +574,7 @@ CONFIG_CRYPTO_SHA512=m
564574
CONFIG_CRYPTO_SHA3=m
565575
CONFIG_CRYPTO_TGR192=m
566576
CONFIG_CRYPTO_WP512=m
577+
CONFIG_CRYPTO_AES_TI=m
567578
CONFIG_CRYPTO_ANUBIS=m
568579
CONFIG_CRYPTO_BLOWFISH=m
569580
CONFIG_CRYPTO_CAMELLIA=m
@@ -588,4 +599,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
588599
CONFIG_CRYPTO_USER_API_RNG=m
589600
CONFIG_CRYPTO_USER_API_AEAD=m
590601
# CONFIG_CRYPTO_HW is not set
602+
CONFIG_CRC32_SELFTEST=m
591603
CONFIG_XZ_DEC_TEST=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CONFIG_SUN_PARTITION=y
2525
# CONFIG_EFI_PARTITION is not set
2626
CONFIG_SYSV68_PARTITION=y
2727
CONFIG_IOSCHED_DEADLINE=m
28+
CONFIG_MQ_IOSCHED_DEADLINE=m
2829
CONFIG_KEXEC=y
2930
CONFIG_BOOTINFO_PROC=y
3031
CONFIG_M68020=y
@@ -58,6 +59,7 @@ CONFIG_NET_IPVTI=m
5859
CONFIG_NET_FOU_IP_TUNNELS=y
5960
CONFIG_INET_AH=m
6061
CONFIG_INET_ESP=m
62+
CONFIG_INET_ESP_OFFLOAD=m
6163
CONFIG_INET_IPCOMP=m
6264
CONFIG_INET_XFRM_MODE_TRANSPORT=m
6365
CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -69,6 +71,7 @@ CONFIG_IPV6=m
6971
CONFIG_IPV6_ROUTER_PREF=y
7072
CONFIG_INET6_AH=m
7173
CONFIG_INET6_ESP=m
74+
CONFIG_INET6_ESP_OFFLOAD=m
7275
CONFIG_INET6_IPCOMP=m
7376
CONFIG_IPV6_ILA=m
7477
CONFIG_IPV6_VTI=m
@@ -99,6 +102,7 @@ CONFIG_NFT_NUMGEN=m
99102
CONFIG_NFT_CT=m
100103
CONFIG_NFT_SET_RBTREE=m
101104
CONFIG_NFT_SET_HASH=m
105+
CONFIG_NFT_SET_BITMAP=m
102106
CONFIG_NFT_COUNTER=m
103107
CONFIG_NFT_LOG=m
104108
CONFIG_NFT_LIMIT=m
@@ -296,6 +300,8 @@ CONFIG_MPLS_IPTUNNEL=m
296300
CONFIG_NET_L3_MASTER_DEV=y
297301
CONFIG_AF_KCM=m
298302
# CONFIG_WIRELESS is not set
303+
CONFIG_PSAMPLE=m
304+
CONFIG_NET_IFE=m
299305
CONFIG_NET_DEVLINK=m
300306
# CONFIG_UEVENT_HELPER is not set
301307
CONFIG_DEVTMPFS=y
@@ -362,6 +368,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
362368
CONFIG_MACVLAN=m
363369
CONFIG_MACVTAP=m
364370
CONFIG_IPVLAN=m
371+
CONFIG_IPVTAP=m
365372
CONFIG_VXLAN=m
366373
CONFIG_GENEVE=m
367374
CONFIG_GTP=m
@@ -372,6 +379,7 @@ CONFIG_VETH=m
372379
# CONFIG_NET_VENDOR_ALACRITECH is not set
373380
# CONFIG_NET_VENDOR_AMAZON is not set
374381
CONFIG_ATARILANCE=y
382+
# CONFIG_NET_VENDOR_AQUANTIA is not set
375383
# CONFIG_NET_VENDOR_ARC is not set
376384
# CONFIG_NET_CADENCE is not set
377385
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -389,7 +397,6 @@ CONFIG_NE2000=y
389397
# CONFIG_NET_VENDOR_SOLARFLARE is not set
390398
CONFIG_SMC91X=y
391399
# CONFIG_NET_VENDOR_STMICRO is not set
392-
# CONFIG_NET_VENDOR_SYNOPSYS is not set
393400
# CONFIG_NET_VENDOR_VIA is not set
394401
# CONFIG_NET_VENDOR_WIZNET is not set
395402
CONFIG_PPP=m
@@ -544,6 +551,8 @@ CONFIG_NLS_MAC_TURKISH=m
544551
CONFIG_DLM=m
545552
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
546553
CONFIG_MAGIC_SYSRQ=y
554+
CONFIG_WW_MUTEX_SELFTEST=m
555+
CONFIG_ATOMIC64_SELFTEST=m
547556
CONFIG_ASYNC_RAID6_TEST=m
548557
CONFIG_TEST_HEXDUMP=m
549558
CONFIG_TEST_STRING_HELPERS=m
@@ -574,6 +583,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m
574583
CONFIG_CRYPTO_LRW=m
575584
CONFIG_CRYPTO_PCBC=m
576585
CONFIG_CRYPTO_KEYWRAP=m
586+
CONFIG_CRYPTO_CMAC=m
577587
CONFIG_CRYPTO_XCBC=m
578588
CONFIG_CRYPTO_VMAC=m
579589
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -585,6 +595,7 @@ CONFIG_CRYPTO_SHA512=m
585595
CONFIG_CRYPTO_SHA3=m
586596
CONFIG_CRYPTO_TGR192=m
587597
CONFIG_CRYPTO_WP512=m
598+
CONFIG_CRYPTO_AES_TI=m
588599
CONFIG_CRYPTO_ANUBIS=m
589600
CONFIG_CRYPTO_BLOWFISH=m
590601
CONFIG_CRYPTO_CAMELLIA=m
@@ -609,4 +620,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
609620
CONFIG_CRYPTO_USER_API_RNG=m
610621
CONFIG_CRYPTO_USER_API_AEAD=m
611622
# CONFIG_CRYPTO_HW is not set
623+
CONFIG_CRC32_SELFTEST=m
612624
CONFIG_XZ_DEC_TEST=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ CONFIG_UNIXWARE_DISKLABEL=y
2525
CONFIG_SUN_PARTITION=y
2626
# CONFIG_EFI_PARTITION is not set
2727
CONFIG_IOSCHED_DEADLINE=m
28+
CONFIG_MQ_IOSCHED_DEADLINE=m
2829
CONFIG_KEXEC=y
2930
CONFIG_BOOTINFO_PROC=y
3031
CONFIG_M68040=y
@@ -56,6 +57,7 @@ CONFIG_NET_IPVTI=m
5657
CONFIG_NET_FOU_IP_TUNNELS=y
5758
CONFIG_INET_AH=m
5859
CONFIG_INET_ESP=m
60+
CONFIG_INET_ESP_OFFLOAD=m
5961
CONFIG_INET_IPCOMP=m
6062
CONFIG_INET_XFRM_MODE_TRANSPORT=m
6163
CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -67,6 +69,7 @@ CONFIG_IPV6=m
6769
CONFIG_IPV6_ROUTER_PREF=y
6870
CONFIG_INET6_AH=m
6971
CONFIG_INET6_ESP=m
72+
CONFIG_INET6_ESP_OFFLOAD=m
7073
CONFIG_INET6_IPCOMP=m
7174
CONFIG_IPV6_ILA=m
7275
CONFIG_IPV6_VTI=m
@@ -97,6 +100,7 @@ CONFIG_NFT_NUMGEN=m
97100
CONFIG_NFT_CT=m
98101
CONFIG_NFT_SET_RBTREE=m
99102
CONFIG_NFT_SET_HASH=m
103+
CONFIG_NFT_SET_BITMAP=m
100104
CONFIG_NFT_COUNTER=m
101105
CONFIG_NFT_LOG=m
102106
CONFIG_NFT_LIMIT=m
@@ -294,6 +298,8 @@ CONFIG_MPLS_IPTUNNEL=m
294298
CONFIG_NET_L3_MASTER_DEV=y
295299
CONFIG_AF_KCM=m
296300
# CONFIG_WIRELESS is not set
301+
CONFIG_PSAMPLE=m
302+
CONFIG_NET_IFE=m
297303
CONFIG_NET_DEVLINK=m
298304
# CONFIG_UEVENT_HELPER is not set
299305
CONFIG_DEVTMPFS=y
@@ -352,6 +358,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
352358
CONFIG_MACVLAN=m
353359
CONFIG_MACVTAP=m
354360
CONFIG_IPVLAN=m
361+
CONFIG_IPVTAP=m
355362
CONFIG_VXLAN=m
356363
CONFIG_GENEVE=m
357364
CONFIG_GTP=m
@@ -361,6 +368,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
361368
CONFIG_VETH=m
362369
# CONFIG_NET_VENDOR_ALACRITECH is not set
363370
# CONFIG_NET_VENDOR_AMAZON is not set
371+
# CONFIG_NET_VENDOR_AQUANTIA is not set
364372
# CONFIG_NET_VENDOR_ARC is not set
365373
# CONFIG_NET_CADENCE is not set
366374
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -377,7 +385,6 @@ CONFIG_BVME6000_NET=y
377385
# CONFIG_NET_VENDOR_SEEQ is not set
378386
# CONFIG_NET_VENDOR_SOLARFLARE is not set
379387
# CONFIG_NET_VENDOR_STMICRO is not set
380-
# CONFIG_NET_VENDOR_SYNOPSYS is not set
381388
# CONFIG_NET_VENDOR_VIA is not set
382389
# CONFIG_NET_VENDOR_WIZNET is not set
383390
CONFIG_PPP=m
@@ -515,6 +522,8 @@ CONFIG_NLS_MAC_TURKISH=m
515522
CONFIG_DLM=m
516523
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
517524
CONFIG_MAGIC_SYSRQ=y
525+
CONFIG_WW_MUTEX_SELFTEST=m
526+
CONFIG_ATOMIC64_SELFTEST=m
518527
CONFIG_ASYNC_RAID6_TEST=m
519528
CONFIG_TEST_HEXDUMP=m
520529
CONFIG_TEST_STRING_HELPERS=m
@@ -545,6 +554,7 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m
545554
CONFIG_CRYPTO_LRW=m
546555
CONFIG_CRYPTO_PCBC=m
547556
CONFIG_CRYPTO_KEYWRAP=m
557+
CONFIG_CRYPTO_CMAC=m
548558
CONFIG_CRYPTO_XCBC=m
549559
CONFIG_CRYPTO_VMAC=m
550560
CONFIG_CRYPTO_MICHAEL_MIC=m
@@ -556,6 +566,7 @@ CONFIG_CRYPTO_SHA512=m
556566
CONFIG_CRYPTO_SHA3=m
557567
CONFIG_CRYPTO_TGR192=m
558568
CONFIG_CRYPTO_WP512=m
569+
CONFIG_CRYPTO_AES_TI=m
559570
CONFIG_CRYPTO_ANUBIS=m
560571
CONFIG_CRYPTO_BLOWFISH=m
561572
CONFIG_CRYPTO_CAMELLIA=m
@@ -580,4 +591,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
580591
CONFIG_CRYPTO_USER_API_RNG=m
581592
CONFIG_CRYPTO_USER_API_AEAD=m
582593
# CONFIG_CRYPTO_HW is not set
594+
CONFIG_CRC32_SELFTEST=m
583595
CONFIG_XZ_DEC_TEST=m

0 commit comments

Comments
 (0)