Skip to content

Commit c353286

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - One more strscpy() conversion - Fix detection of real Mac II - defconfig updates * tag 'm68k-for-v6.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v6.15-rc1 m68k: mac: Fix macintosh_config for Mac II m68k: Replace strcpy() with strscpy() in hardware_proc_show()
2 parents 5cf5240 + f440518 commit c353286

14 files changed

Lines changed: 2 additions & 50 deletions

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
602602
CONFIG_CRYPTO_USER_API_RNG=m
603603
CONFIG_CRYPTO_USER_API_AEAD=m
604604
# CONFIG_CRYPTO_HW is not set
605-
CONFIG_PRIME_NUMBERS=m
606605
CONFIG_XZ_DEC_TEST=m
607606
CONFIG_GLOB_SELFTEST=m
608607
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -621,8 +620,6 @@ CONFIG_ATOMIC64_SELFTEST=m
621620
CONFIG_ASYNC_RAID6_TEST=m
622621
CONFIG_TEST_HEXDUMP=m
623622
CONFIG_TEST_KSTRTOX=m
624-
CONFIG_TEST_PRINTF=m
625-
CONFIG_TEST_SCANF=m
626623
CONFIG_TEST_BITMAP=m
627624
CONFIG_TEST_UUID=m
628625
CONFIG_TEST_XARRAY=m
@@ -632,7 +629,6 @@ CONFIG_TEST_IDA=m
632629
CONFIG_TEST_BITOPS=m
633630
CONFIG_TEST_VMALLOC=m
634631
CONFIG_TEST_BPF=m
635-
CONFIG_TEST_BLACKHOLE_DEV=m
636632
CONFIG_FIND_BIT_BENCHMARK=m
637633
CONFIG_TEST_FIRMWARE=m
638634
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
559559
CONFIG_CRYPTO_USER_API_RNG=m
560560
CONFIG_CRYPTO_USER_API_AEAD=m
561561
# CONFIG_CRYPTO_HW is not set
562-
CONFIG_PRIME_NUMBERS=m
563562
CONFIG_XZ_DEC_TEST=m
564563
CONFIG_GLOB_SELFTEST=m
565564
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -578,8 +577,6 @@ CONFIG_ATOMIC64_SELFTEST=m
578577
CONFIG_ASYNC_RAID6_TEST=m
579578
CONFIG_TEST_HEXDUMP=m
580579
CONFIG_TEST_KSTRTOX=m
581-
CONFIG_TEST_PRINTF=m
582-
CONFIG_TEST_SCANF=m
583580
CONFIG_TEST_BITMAP=m
584581
CONFIG_TEST_UUID=m
585582
CONFIG_TEST_XARRAY=m
@@ -589,7 +586,6 @@ CONFIG_TEST_IDA=m
589586
CONFIG_TEST_BITOPS=m
590587
CONFIG_TEST_VMALLOC=m
591588
CONFIG_TEST_BPF=m
592-
CONFIG_TEST_BLACKHOLE_DEV=m
593589
CONFIG_FIND_BIT_BENCHMARK=m
594590
CONFIG_TEST_FIRMWARE=m
595591
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
579579
CONFIG_CRYPTO_USER_API_RNG=m
580580
CONFIG_CRYPTO_USER_API_AEAD=m
581581
# CONFIG_CRYPTO_HW is not set
582-
CONFIG_PRIME_NUMBERS=m
583582
CONFIG_XZ_DEC_TEST=m
584583
CONFIG_GLOB_SELFTEST=m
585584
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -598,8 +597,6 @@ CONFIG_ATOMIC64_SELFTEST=m
598597
CONFIG_ASYNC_RAID6_TEST=m
599598
CONFIG_TEST_HEXDUMP=m
600599
CONFIG_TEST_KSTRTOX=m
601-
CONFIG_TEST_PRINTF=m
602-
CONFIG_TEST_SCANF=m
603600
CONFIG_TEST_BITMAP=m
604601
CONFIG_TEST_UUID=m
605602
CONFIG_TEST_XARRAY=m
@@ -609,7 +606,6 @@ CONFIG_TEST_IDA=m
609606
CONFIG_TEST_BITOPS=m
610607
CONFIG_TEST_VMALLOC=m
611608
CONFIG_TEST_BPF=m
612-
CONFIG_TEST_BLACKHOLE_DEV=m
613609
CONFIG_FIND_BIT_BENCHMARK=m
614610
CONFIG_TEST_FIRMWARE=m
615611
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
551551
CONFIG_CRYPTO_USER_API_RNG=m
552552
CONFIG_CRYPTO_USER_API_AEAD=m
553553
# CONFIG_CRYPTO_HW is not set
554-
CONFIG_PRIME_NUMBERS=m
555554
CONFIG_XZ_DEC_TEST=m
556555
CONFIG_GLOB_SELFTEST=m
557556
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -570,8 +569,6 @@ CONFIG_ATOMIC64_SELFTEST=m
570569
CONFIG_ASYNC_RAID6_TEST=m
571570
CONFIG_TEST_HEXDUMP=m
572571
CONFIG_TEST_KSTRTOX=m
573-
CONFIG_TEST_PRINTF=m
574-
CONFIG_TEST_SCANF=m
575572
CONFIG_TEST_BITMAP=m
576573
CONFIG_TEST_UUID=m
577574
CONFIG_TEST_XARRAY=m
@@ -581,7 +578,6 @@ CONFIG_TEST_IDA=m
581578
CONFIG_TEST_BITOPS=m
582579
CONFIG_TEST_VMALLOC=m
583580
CONFIG_TEST_BPF=m
584-
CONFIG_TEST_BLACKHOLE_DEV=m
585581
CONFIG_FIND_BIT_BENCHMARK=m
586582
CONFIG_TEST_FIRMWARE=m
587583
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
561561
CONFIG_CRYPTO_USER_API_RNG=m
562562
CONFIG_CRYPTO_USER_API_AEAD=m
563563
# CONFIG_CRYPTO_HW is not set
564-
CONFIG_PRIME_NUMBERS=m
565564
CONFIG_XZ_DEC_TEST=m
566565
CONFIG_GLOB_SELFTEST=m
567566
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -580,8 +579,6 @@ CONFIG_ATOMIC64_SELFTEST=m
580579
CONFIG_ASYNC_RAID6_TEST=m
581580
CONFIG_TEST_HEXDUMP=m
582581
CONFIG_TEST_KSTRTOX=m
583-
CONFIG_TEST_PRINTF=m
584-
CONFIG_TEST_SCANF=m
585582
CONFIG_TEST_BITMAP=m
586583
CONFIG_TEST_UUID=m
587584
CONFIG_TEST_XARRAY=m
@@ -591,7 +588,6 @@ CONFIG_TEST_IDA=m
591588
CONFIG_TEST_BITOPS=m
592589
CONFIG_TEST_VMALLOC=m
593590
CONFIG_TEST_BPF=m
594-
CONFIG_TEST_BLACKHOLE_DEV=m
595591
CONFIG_FIND_BIT_BENCHMARK=m
596592
CONFIG_TEST_FIRMWARE=m
597593
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
578578
CONFIG_CRYPTO_USER_API_RNG=m
579579
CONFIG_CRYPTO_USER_API_AEAD=m
580580
# CONFIG_CRYPTO_HW is not set
581-
CONFIG_PRIME_NUMBERS=m
582581
CONFIG_XZ_DEC_TEST=m
583582
CONFIG_GLOB_SELFTEST=m
584583
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -597,8 +596,6 @@ CONFIG_ATOMIC64_SELFTEST=m
597596
CONFIG_ASYNC_RAID6_TEST=m
598597
CONFIG_TEST_HEXDUMP=m
599598
CONFIG_TEST_KSTRTOX=m
600-
CONFIG_TEST_PRINTF=m
601-
CONFIG_TEST_SCANF=m
602599
CONFIG_TEST_BITMAP=m
603600
CONFIG_TEST_UUID=m
604601
CONFIG_TEST_XARRAY=m
@@ -608,7 +605,6 @@ CONFIG_TEST_IDA=m
608605
CONFIG_TEST_BITOPS=m
609606
CONFIG_TEST_VMALLOC=m
610607
CONFIG_TEST_BPF=m
611-
CONFIG_TEST_BLACKHOLE_DEV=m
612608
CONFIG_FIND_BIT_BENCHMARK=m
613609
CONFIG_TEST_FIRMWARE=m
614610
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
665665
CONFIG_CRYPTO_USER_API_RNG=m
666666
CONFIG_CRYPTO_USER_API_AEAD=m
667667
# CONFIG_CRYPTO_HW is not set
668-
CONFIG_PRIME_NUMBERS=m
669668
CONFIG_XZ_DEC_TEST=m
670669
CONFIG_GLOB_SELFTEST=m
671670
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -684,8 +683,6 @@ CONFIG_ATOMIC64_SELFTEST=m
684683
CONFIG_ASYNC_RAID6_TEST=m
685684
CONFIG_TEST_HEXDUMP=m
686685
CONFIG_TEST_KSTRTOX=m
687-
CONFIG_TEST_PRINTF=m
688-
CONFIG_TEST_SCANF=m
689686
CONFIG_TEST_BITMAP=m
690687
CONFIG_TEST_UUID=m
691688
CONFIG_TEST_XARRAY=m
@@ -695,7 +692,6 @@ CONFIG_TEST_IDA=m
695692
CONFIG_TEST_BITOPS=m
696693
CONFIG_TEST_VMALLOC=m
697694
CONFIG_TEST_BPF=m
698-
CONFIG_TEST_BLACKHOLE_DEV=m
699695
CONFIG_FIND_BIT_BENCHMARK=m
700696
CONFIG_TEST_FIRMWARE=m
701697
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
551551
CONFIG_CRYPTO_USER_API_RNG=m
552552
CONFIG_CRYPTO_USER_API_AEAD=m
553553
# CONFIG_CRYPTO_HW is not set
554-
CONFIG_PRIME_NUMBERS=m
555554
CONFIG_XZ_DEC_TEST=m
556555
CONFIG_GLOB_SELFTEST=m
557556
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -570,8 +569,6 @@ CONFIG_ATOMIC64_SELFTEST=m
570569
CONFIG_ASYNC_RAID6_TEST=m
571570
CONFIG_TEST_HEXDUMP=m
572571
CONFIG_TEST_KSTRTOX=m
573-
CONFIG_TEST_PRINTF=m
574-
CONFIG_TEST_SCANF=m
575572
CONFIG_TEST_BITMAP=m
576573
CONFIG_TEST_UUID=m
577574
CONFIG_TEST_XARRAY=m
@@ -581,7 +578,6 @@ CONFIG_TEST_IDA=m
581578
CONFIG_TEST_BITOPS=m
582579
CONFIG_TEST_VMALLOC=m
583580
CONFIG_TEST_BPF=m
584-
CONFIG_TEST_BLACKHOLE_DEV=m
585581
CONFIG_FIND_BIT_BENCHMARK=m
586582
CONFIG_TEST_FIRMWARE=m
587583
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
552552
CONFIG_CRYPTO_USER_API_RNG=m
553553
CONFIG_CRYPTO_USER_API_AEAD=m
554554
# CONFIG_CRYPTO_HW is not set
555-
CONFIG_PRIME_NUMBERS=m
556555
CONFIG_XZ_DEC_TEST=m
557556
CONFIG_GLOB_SELFTEST=m
558557
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -571,8 +570,6 @@ CONFIG_ATOMIC64_SELFTEST=m
571570
CONFIG_ASYNC_RAID6_TEST=m
572571
CONFIG_TEST_HEXDUMP=m
573572
CONFIG_TEST_KSTRTOX=m
574-
CONFIG_TEST_PRINTF=m
575-
CONFIG_TEST_SCANF=m
576573
CONFIG_TEST_BITMAP=m
577574
CONFIG_TEST_UUID=m
578575
CONFIG_TEST_XARRAY=m
@@ -582,7 +579,6 @@ CONFIG_TEST_IDA=m
582579
CONFIG_TEST_BITOPS=m
583580
CONFIG_TEST_VMALLOC=m
584581
CONFIG_TEST_BPF=m
585-
CONFIG_TEST_BLACKHOLE_DEV=m
586582
CONFIG_FIND_BIT_BENCHMARK=m
587583
CONFIG_TEST_FIRMWARE=m
588584
CONFIG_TEST_SYSCTL=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
568568
CONFIG_CRYPTO_USER_API_RNG=m
569569
CONFIG_CRYPTO_USER_API_AEAD=m
570570
# CONFIG_CRYPTO_HW is not set
571-
CONFIG_PRIME_NUMBERS=m
572571
CONFIG_XZ_DEC_TEST=m
573572
CONFIG_GLOB_SELFTEST=m
574573
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -587,8 +586,6 @@ CONFIG_ATOMIC64_SELFTEST=m
587586
CONFIG_ASYNC_RAID6_TEST=m
588587
CONFIG_TEST_HEXDUMP=m
589588
CONFIG_TEST_KSTRTOX=m
590-
CONFIG_TEST_PRINTF=m
591-
CONFIG_TEST_SCANF=m
592589
CONFIG_TEST_BITMAP=m
593590
CONFIG_TEST_UUID=m
594591
CONFIG_TEST_XARRAY=m
@@ -598,7 +595,6 @@ CONFIG_TEST_IDA=m
598595
CONFIG_TEST_BITOPS=m
599596
CONFIG_TEST_VMALLOC=m
600597
CONFIG_TEST_BPF=m
601-
CONFIG_TEST_BLACKHOLE_DEV=m
602598
CONFIG_FIND_BIT_BENCHMARK=m
603599
CONFIG_TEST_FIRMWARE=m
604600
CONFIG_TEST_SYSCTL=m

0 commit comments

Comments
 (0)