Skip to content

Commit 03feb7c

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - A small comma vs semicolon cleanup - defconfig updates * tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v5.15-rc1 m68k: muldi3: Use semicolon instead of comma
2 parents 552ebfe + 8a3c0a7 commit 03feb7c

13 files changed

+61
-25
lines changed

‎arch/m68k/configs/amiga_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ CONFIG_MPLS_ROUTING=m
302302
CONFIG_MPLS_IPTUNNEL=m
303303
CONFIG_NET_NSH=m
304304
CONFIG_AF_KCM=m
305+
CONFIG_MCTP=m
305306
# CONFIG_WIRELESS is not set
306307
CONFIG_PSAMPLE=m
307308
CONFIG_NET_IFE=m
@@ -474,6 +475,8 @@ CONFIG_UDF_FS=m
474475
CONFIG_MSDOS_FS=m
475476
CONFIG_VFAT_FS=m
476477
CONFIG_EXFAT_FS=m
478+
CONFIG_NTFS3_FS=m
479+
CONFIG_NTFS3_LZX_XPRESS=y
477480
CONFIG_PROC_KCORE=y
478481
CONFIG_PROC_CHILDREN=y
479482
CONFIG_TMPFS=y
@@ -580,6 +583,7 @@ CONFIG_CRYPTO_ADIANTUM=m
580583
CONFIG_CRYPTO_XCBC=m
581584
CONFIG_CRYPTO_VMAC=m
582585
CONFIG_CRYPTO_BLAKE2S=m
586+
CONFIG_CRYPTO_MD4=m
583587
CONFIG_CRYPTO_MICHAEL_MIC=m
584588
CONFIG_CRYPTO_RMD160=m
585589
CONFIG_CRYPTO_SHA3=m
@@ -618,7 +622,6 @@ CONFIG_CRC32_SELFTEST=m
618622
CONFIG_CRC64=m
619623
CONFIG_XZ_DEC_TEST=m
620624
CONFIG_GLOB_SELFTEST=m
621-
CONFIG_STRING_SELFTEST=m
622625
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
623626
CONFIG_MAGIC_SYSRQ=y
624627
CONFIG_TEST_LOCKUP=m
@@ -627,12 +630,12 @@ CONFIG_EARLY_PRINTK=y
627630
CONFIG_KUNIT=m
628631
CONFIG_KUNIT_ALL_TESTS=m
629632
CONFIG_TEST_MIN_HEAP=m
630-
CONFIG_TEST_SORT=m
631633
CONFIG_TEST_DIV64=m
632634
CONFIG_REED_SOLOMON_TEST=m
633635
CONFIG_ATOMIC64_SELFTEST=m
634636
CONFIG_ASYNC_RAID6_TEST=m
635637
CONFIG_TEST_HEXDUMP=m
638+
CONFIG_STRING_SELFTEST=m
636639
CONFIG_TEST_STRING_HELPERS=m
637640
CONFIG_TEST_STRSCPY=m
638641
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ CONFIG_MPLS_ROUTING=m
298298
CONFIG_MPLS_IPTUNNEL=m
299299
CONFIG_NET_NSH=m
300300
CONFIG_AF_KCM=m
301+
CONFIG_MCTP=m
301302
# CONFIG_WIRELESS is not set
302303
CONFIG_PSAMPLE=m
303304
CONFIG_NET_IFE=m
@@ -431,6 +432,8 @@ CONFIG_UDF_FS=m
431432
CONFIG_MSDOS_FS=m
432433
CONFIG_VFAT_FS=m
433434
CONFIG_EXFAT_FS=m
435+
CONFIG_NTFS3_FS=m
436+
CONFIG_NTFS3_LZX_XPRESS=y
434437
CONFIG_PROC_KCORE=y
435438
CONFIG_PROC_CHILDREN=y
436439
CONFIG_TMPFS=y
@@ -537,6 +540,7 @@ CONFIG_CRYPTO_ADIANTUM=m
537540
CONFIG_CRYPTO_XCBC=m
538541
CONFIG_CRYPTO_VMAC=m
539542
CONFIG_CRYPTO_BLAKE2S=m
543+
CONFIG_CRYPTO_MD4=m
540544
CONFIG_CRYPTO_MICHAEL_MIC=m
541545
CONFIG_CRYPTO_RMD160=m
542546
CONFIG_CRYPTO_SHA3=m
@@ -574,7 +578,6 @@ CONFIG_PRIME_NUMBERS=m
574578
CONFIG_CRC32_SELFTEST=m
575579
CONFIG_CRC64=m
576580
CONFIG_XZ_DEC_TEST=m
577-
CONFIG_STRING_SELFTEST=m
578581
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
579582
CONFIG_MAGIC_SYSRQ=y
580583
CONFIG_TEST_LOCKUP=m
@@ -583,12 +586,12 @@ CONFIG_EARLY_PRINTK=y
583586
CONFIG_KUNIT=m
584587
CONFIG_KUNIT_ALL_TESTS=m
585588
CONFIG_TEST_MIN_HEAP=m
586-
CONFIG_TEST_SORT=m
587589
CONFIG_TEST_DIV64=m
588590
CONFIG_REED_SOLOMON_TEST=m
589591
CONFIG_ATOMIC64_SELFTEST=m
590592
CONFIG_ASYNC_RAID6_TEST=m
591593
CONFIG_TEST_HEXDUMP=m
594+
CONFIG_STRING_SELFTEST=m
592595
CONFIG_TEST_STRING_HELPERS=m
593596
CONFIG_TEST_STRSCPY=m
594597
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ CONFIG_MPLS_ROUTING=m
305305
CONFIG_MPLS_IPTUNNEL=m
306306
CONFIG_NET_NSH=m
307307
CONFIG_AF_KCM=m
308+
CONFIG_MCTP=m
308309
# CONFIG_WIRELESS is not set
309310
CONFIG_PSAMPLE=m
310311
CONFIG_NET_IFE=m
@@ -452,6 +453,8 @@ CONFIG_UDF_FS=m
452453
CONFIG_MSDOS_FS=m
453454
CONFIG_VFAT_FS=m
454455
CONFIG_EXFAT_FS=m
456+
CONFIG_NTFS3_FS=m
457+
CONFIG_NTFS3_LZX_XPRESS=y
455458
CONFIG_PROC_KCORE=y
456459
CONFIG_PROC_CHILDREN=y
457460
CONFIG_TMPFS=y
@@ -558,6 +561,7 @@ CONFIG_CRYPTO_ADIANTUM=m
558561
CONFIG_CRYPTO_XCBC=m
559562
CONFIG_CRYPTO_VMAC=m
560563
CONFIG_CRYPTO_BLAKE2S=m
564+
CONFIG_CRYPTO_MD4=m
561565
CONFIG_CRYPTO_MICHAEL_MIC=m
562566
CONFIG_CRYPTO_RMD160=m
563567
CONFIG_CRYPTO_SHA3=m
@@ -596,7 +600,6 @@ CONFIG_CRC32_SELFTEST=m
596600
CONFIG_CRC64=m
597601
CONFIG_XZ_DEC_TEST=m
598602
CONFIG_GLOB_SELFTEST=m
599-
CONFIG_STRING_SELFTEST=m
600603
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
601604
CONFIG_MAGIC_SYSRQ=y
602605
CONFIG_TEST_LOCKUP=m
@@ -605,12 +608,12 @@ CONFIG_EARLY_PRINTK=y
605608
CONFIG_KUNIT=m
606609
CONFIG_KUNIT_ALL_TESTS=m
607610
CONFIG_TEST_MIN_HEAP=m
608-
CONFIG_TEST_SORT=m
609611
CONFIG_TEST_DIV64=m
610612
CONFIG_REED_SOLOMON_TEST=m
611613
CONFIG_ATOMIC64_SELFTEST=m
612614
CONFIG_ASYNC_RAID6_TEST=m
613615
CONFIG_TEST_HEXDUMP=m
616+
CONFIG_STRING_SELFTEST=m
614617
CONFIG_TEST_STRING_HELPERS=m
615618
CONFIG_TEST_STRSCPY=m
616619
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ CONFIG_MPLS_ROUTING=m
295295
CONFIG_MPLS_IPTUNNEL=m
296296
CONFIG_NET_NSH=m
297297
CONFIG_AF_KCM=m
298+
CONFIG_MCTP=m
298299
# CONFIG_WIRELESS is not set
299300
CONFIG_PSAMPLE=m
300301
CONFIG_NET_IFE=m
@@ -424,6 +425,8 @@ CONFIG_UDF_FS=m
424425
CONFIG_MSDOS_FS=m
425426
CONFIG_VFAT_FS=m
426427
CONFIG_EXFAT_FS=m
428+
CONFIG_NTFS3_FS=m
429+
CONFIG_NTFS3_LZX_XPRESS=y
427430
CONFIG_PROC_KCORE=y
428431
CONFIG_PROC_CHILDREN=y
429432
CONFIG_TMPFS=y
@@ -530,6 +533,7 @@ CONFIG_CRYPTO_ADIANTUM=m
530533
CONFIG_CRYPTO_XCBC=m
531534
CONFIG_CRYPTO_VMAC=m
532535
CONFIG_CRYPTO_BLAKE2S=m
536+
CONFIG_CRYPTO_MD4=m
533537
CONFIG_CRYPTO_MICHAEL_MIC=m
534538
CONFIG_CRYPTO_RMD160=m
535539
CONFIG_CRYPTO_SHA3=m
@@ -567,7 +571,6 @@ CONFIG_PRIME_NUMBERS=m
567571
CONFIG_CRC32_SELFTEST=m
568572
CONFIG_CRC64=m
569573
CONFIG_XZ_DEC_TEST=m
570-
CONFIG_STRING_SELFTEST=m
571574
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
572575
CONFIG_MAGIC_SYSRQ=y
573576
CONFIG_TEST_LOCKUP=m
@@ -576,12 +579,12 @@ CONFIG_EARLY_PRINTK=y
576579
CONFIG_KUNIT=m
577580
CONFIG_KUNIT_ALL_TESTS=m
578581
CONFIG_TEST_MIN_HEAP=m
579-
CONFIG_TEST_SORT=m
580582
CONFIG_TEST_DIV64=m
581583
CONFIG_REED_SOLOMON_TEST=m
582584
CONFIG_ATOMIC64_SELFTEST=m
583585
CONFIG_ASYNC_RAID6_TEST=m
584586
CONFIG_TEST_HEXDUMP=m
587+
CONFIG_STRING_SELFTEST=m
585588
CONFIG_TEST_STRING_HELPERS=m
586589
CONFIG_TEST_STRSCPY=m
587590
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ CONFIG_MPLS_ROUTING=m
297297
CONFIG_MPLS_IPTUNNEL=m
298298
CONFIG_NET_NSH=m
299299
CONFIG_AF_KCM=m
300+
CONFIG_MCTP=m
300301
# CONFIG_WIRELESS is not set
301302
CONFIG_PSAMPLE=m
302303
CONFIG_NET_IFE=m
@@ -433,6 +434,8 @@ CONFIG_UDF_FS=m
433434
CONFIG_MSDOS_FS=m
434435
CONFIG_VFAT_FS=m
435436
CONFIG_EXFAT_FS=m
437+
CONFIG_NTFS3_FS=m
438+
CONFIG_NTFS3_LZX_XPRESS=y
436439
CONFIG_PROC_KCORE=y
437440
CONFIG_PROC_CHILDREN=y
438441
CONFIG_TMPFS=y
@@ -539,6 +542,7 @@ CONFIG_CRYPTO_ADIANTUM=m
539542
CONFIG_CRYPTO_XCBC=m
540543
CONFIG_CRYPTO_VMAC=m
541544
CONFIG_CRYPTO_BLAKE2S=m
545+
CONFIG_CRYPTO_MD4=m
542546
CONFIG_CRYPTO_MICHAEL_MIC=m
543547
CONFIG_CRYPTO_RMD160=m
544548
CONFIG_CRYPTO_SHA3=m
@@ -576,7 +580,6 @@ CONFIG_PRIME_NUMBERS=m
576580
CONFIG_CRC32_SELFTEST=m
577581
CONFIG_CRC64=m
578582
CONFIG_XZ_DEC_TEST=m
579-
CONFIG_STRING_SELFTEST=m
580583
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
581584
CONFIG_MAGIC_SYSRQ=y
582585
CONFIG_TEST_LOCKUP=m
@@ -585,12 +588,12 @@ CONFIG_EARLY_PRINTK=y
585588
CONFIG_KUNIT=m
586589
CONFIG_KUNIT_ALL_TESTS=m
587590
CONFIG_TEST_MIN_HEAP=m
588-
CONFIG_TEST_SORT=m
589591
CONFIG_TEST_DIV64=m
590592
CONFIG_REED_SOLOMON_TEST=m
591593
CONFIG_ATOMIC64_SELFTEST=m
592594
CONFIG_ASYNC_RAID6_TEST=m
593595
CONFIG_TEST_HEXDUMP=m
596+
CONFIG_STRING_SELFTEST=m
594597
CONFIG_TEST_STRING_HELPERS=m
595598
CONFIG_TEST_STRSCPY=m
596599
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ CONFIG_MPLS_ROUTING=m
299299
CONFIG_MPLS_IPTUNNEL=m
300300
CONFIG_NET_NSH=m
301301
CONFIG_AF_KCM=m
302+
CONFIG_MCTP=m
302303
# CONFIG_WIRELESS is not set
303304
CONFIG_PSAMPLE=m
304305
CONFIG_NET_IFE=m
@@ -454,6 +455,8 @@ CONFIG_UDF_FS=m
454455
CONFIG_MSDOS_FS=m
455456
CONFIG_VFAT_FS=m
456457
CONFIG_EXFAT_FS=m
458+
CONFIG_NTFS3_FS=m
459+
CONFIG_NTFS3_LZX_XPRESS=y
457460
CONFIG_PROC_KCORE=y
458461
CONFIG_PROC_CHILDREN=y
459462
CONFIG_TMPFS=y
@@ -560,6 +563,7 @@ CONFIG_CRYPTO_ADIANTUM=m
560563
CONFIG_CRYPTO_XCBC=m
561564
CONFIG_CRYPTO_VMAC=m
562565
CONFIG_CRYPTO_BLAKE2S=m
566+
CONFIG_CRYPTO_MD4=m
563567
CONFIG_CRYPTO_MICHAEL_MIC=m
564568
CONFIG_CRYPTO_RMD160=m
565569
CONFIG_CRYPTO_SHA3=m
@@ -598,7 +602,6 @@ CONFIG_CRC32_SELFTEST=m
598602
CONFIG_CRC64=m
599603
CONFIG_XZ_DEC_TEST=m
600604
CONFIG_GLOB_SELFTEST=m
601-
CONFIG_STRING_SELFTEST=m
602605
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
603606
CONFIG_MAGIC_SYSRQ=y
604607
CONFIG_TEST_LOCKUP=m
@@ -607,12 +610,12 @@ CONFIG_EARLY_PRINTK=y
607610
CONFIG_KUNIT=m
608611
CONFIG_KUNIT_ALL_TESTS=m
609612
CONFIG_TEST_MIN_HEAP=m
610-
CONFIG_TEST_SORT=m
611613
CONFIG_TEST_DIV64=m
612614
CONFIG_REED_SOLOMON_TEST=m
613615
CONFIG_ATOMIC64_SELFTEST=m
614616
CONFIG_ASYNC_RAID6_TEST=m
615617
CONFIG_TEST_HEXDUMP=m
618+
CONFIG_STRING_SELFTEST=m
616619
CONFIG_TEST_STRING_HELPERS=m
617620
CONFIG_TEST_STRSCPY=m
618621
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ CONFIG_MPLS_ROUTING=m
319319
CONFIG_MPLS_IPTUNNEL=m
320320
CONFIG_NET_NSH=m
321321
CONFIG_AF_KCM=m
322+
CONFIG_MCTP=m
322323
# CONFIG_WIRELESS is not set
323324
CONFIG_PSAMPLE=m
324325
CONFIG_NET_IFE=m
@@ -539,6 +540,8 @@ CONFIG_UDF_FS=m
539540
CONFIG_MSDOS_FS=m
540541
CONFIG_VFAT_FS=m
541542
CONFIG_EXFAT_FS=m
543+
CONFIG_NTFS3_FS=m
544+
CONFIG_NTFS3_LZX_XPRESS=y
542545
CONFIG_PROC_KCORE=y
543546
CONFIG_PROC_CHILDREN=y
544547
CONFIG_TMPFS=y
@@ -645,6 +648,7 @@ CONFIG_CRYPTO_ADIANTUM=m
645648
CONFIG_CRYPTO_XCBC=m
646649
CONFIG_CRYPTO_VMAC=m
647650
CONFIG_CRYPTO_BLAKE2S=m
651+
CONFIG_CRYPTO_MD4=m
648652
CONFIG_CRYPTO_MICHAEL_MIC=m
649653
CONFIG_CRYPTO_RMD160=m
650654
CONFIG_CRYPTO_SHA3=m
@@ -683,7 +687,6 @@ CONFIG_CRC32_SELFTEST=m
683687
CONFIG_CRC64=m
684688
CONFIG_XZ_DEC_TEST=m
685689
CONFIG_GLOB_SELFTEST=m
686-
CONFIG_STRING_SELFTEST=m
687690
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
688691
CONFIG_MAGIC_SYSRQ=y
689692
CONFIG_TEST_LOCKUP=m
@@ -692,12 +695,12 @@ CONFIG_EARLY_PRINTK=y
692695
CONFIG_KUNIT=m
693696
CONFIG_KUNIT_ALL_TESTS=m
694697
CONFIG_TEST_MIN_HEAP=m
695-
CONFIG_TEST_SORT=m
696698
CONFIG_TEST_DIV64=m
697699
CONFIG_REED_SOLOMON_TEST=m
698700
CONFIG_ATOMIC64_SELFTEST=m
699701
CONFIG_ASYNC_RAID6_TEST=m
700702
CONFIG_TEST_HEXDUMP=m
703+
CONFIG_STRING_SELFTEST=m
701704
CONFIG_TEST_STRING_HELPERS=m
702705
CONFIG_TEST_STRSCPY=m
703706
CONFIG_TEST_KSTRTOX=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ CONFIG_MPLS_ROUTING=m
294294
CONFIG_MPLS_IPTUNNEL=m
295295
CONFIG_NET_NSH=m
296296
CONFIG_AF_KCM=m
297+
CONFIG_MCTP=m
297298
# CONFIG_WIRELESS is not set
298299
CONFIG_PSAMPLE=m
299300
CONFIG_NET_IFE=m
@@ -423,6 +424,8 @@ CONFIG_UDF_FS=m
423424
CONFIG_MSDOS_FS=m
424425
CONFIG_VFAT_FS=m
425426
CONFIG_EXFAT_FS=m
427+
CONFIG_NTFS3_FS=m
428+
CONFIG_NTFS3_LZX_XPRESS=y
426429
CONFIG_PROC_KCORE=y
427430
CONFIG_PROC_CHILDREN=y
428431
CONFIG_TMPFS=y
@@ -529,6 +532,7 @@ CONFIG_CRYPTO_ADIANTUM=m
529532
CONFIG_CRYPTO_XCBC=m
530533
CONFIG_CRYPTO_VMAC=m
531534
CONFIG_CRYPTO_BLAKE2S=m
535+
CONFIG_CRYPTO_MD4=m
532536
CONFIG_CRYPTO_MICHAEL_MIC=m
533537
CONFIG_CRYPTO_RMD160=m
534538
CONFIG_CRYPTO_SHA3=m
@@ -566,7 +570,6 @@ CONFIG_PRIME_NUMBERS=m
566570
CONFIG_CRC32_SELFTEST=m
567571
CONFIG_CRC64=m
568572
CONFIG_XZ_DEC_TEST=m
569-
CONFIG_STRING_SELFTEST=m
570573
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
571574
CONFIG_MAGIC_SYSRQ=y
572575
CONFIG_TEST_LOCKUP=m
@@ -575,12 +578,12 @@ CONFIG_EARLY_PRINTK=y
575578
CONFIG_KUNIT=m
576579
CONFIG_KUNIT_ALL_TESTS=m
577580
CONFIG_TEST_MIN_HEAP=m
578-
CONFIG_TEST_SORT=m
579581
CONFIG_TEST_DIV64=m
580582
CONFIG_REED_SOLOMON_TEST=m
581583
CONFIG_ATOMIC64_SELFTEST=m
582584
CONFIG_ASYNC_RAID6_TEST=m
583585
CONFIG_TEST_HEXDUMP=m
586+
CONFIG_STRING_SELFTEST=m
584587
CONFIG_TEST_STRING_HELPERS=m
585588
CONFIG_TEST_STRSCPY=m
586589
CONFIG_TEST_KSTRTOX=m

0 commit comments

Comments
 (0)