Skip to content

Commit 3ee3723

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - several Mac fixes - defconfig updates - minor cleanups and fixes * tag 'm68k-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: tools: Replace zero-length array with flexible-array member m68k: Add missing __user annotation in get_user() m68k: mac: Avoid stuck ISM IOP interrupt on Quadra 900/950 m68k: mac: Remove misleading comment m68k: mac: Don't call via_flush_cache() on Mac IIfx m68k: defconfig: Update defconfigs for v5.7-rc1 m68k: amiga: config: Replace zero-length array with flexible-array member m68k: amiga: config: Mark expected switch fall-through
2 parents 4e90912 + 3381df0 commit 3ee3723

19 files changed

+102
-60
lines changed

‎arch/m68k/amiga/config.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ static void __init amiga_identify(void)
221221
case AMI_1200:
222222
AMIGAHW_SET(A1200_IDE);
223223
AMIGAHW_SET(PCMCIA);
224+
fallthrough;
224225
case AMI_500:
225226
case AMI_500PLUS:
226227
case AMI_1000:
@@ -233,7 +234,7 @@ static void __init amiga_identify(void)
233234
case AMI_3000T:
234235
AMIGAHW_SET(AMBER_FF);
235236
AMIGAHW_SET(MAGIC_REKICK);
236-
/* fall through */
237+
fallthrough;
237238
case AMI_3000PLUS:
238239
AMIGAHW_SET(A3000_SCSI);
239240
AMIGAHW_SET(A3000_CLK);
@@ -242,7 +243,7 @@ static void __init amiga_identify(void)
242243

243244
case AMI_4000T:
244245
AMIGAHW_SET(A4000_SCSI);
245-
/* fall through */
246+
fallthrough;
246247
case AMI_4000:
247248
AMIGAHW_SET(A4000_IDE);
248249
AMIGAHW_SET(A3000_CLK);
@@ -628,7 +629,7 @@ struct savekmsg {
628629
unsigned long magic2; /* SAVEKMSG_MAGIC2 */
629630
unsigned long magicptr; /* address of magic1 */
630631
unsigned long size;
631-
char data[0];
632+
char data[];
632633
};
633634

634635
static struct savekmsg *savekmsg;

‎arch/m68k/configs/amiga_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ CONFIG_NF_CONNTRACK_SANE=m
100100
CONFIG_NF_CONNTRACK_SIP=m
101101
CONFIG_NF_CONNTRACK_TFTP=m
102102
CONFIG_NF_TABLES=m
103-
CONFIG_NF_TABLES_SET=m
104103
CONFIG_NF_TABLES_INET=y
105104
CONFIG_NF_TABLES_NETDEV=y
106105
CONFIG_NFT_NUMGEN=m
@@ -381,6 +380,7 @@ CONFIG_IPVLAN=m
381380
CONFIG_IPVTAP=m
382381
CONFIG_VXLAN=m
383382
CONFIG_GENEVE=m
383+
CONFIG_BAREUDP=m
384384
CONFIG_GTP=m
385385
CONFIG_MACSEC=m
386386
CONFIG_NETCONSOLE=m
@@ -452,6 +452,7 @@ CONFIG_RTC_CLASS=y
452452
CONFIG_RTC_DRV_MSM6242=m
453453
CONFIG_RTC_DRV_RP5C01=m
454454
# CONFIG_VIRTIO_MENU is not set
455+
# CONFIG_VHOST_MENU is not set
455456
# CONFIG_IOMMU_SUPPORT is not set
456457
CONFIG_DAX=m
457458
CONFIG_EXT4_FS=y
@@ -472,6 +473,7 @@ CONFIG_ZISOFS=y
472473
CONFIG_UDF_FS=m
473474
CONFIG_MSDOS_FS=m
474475
CONFIG_VFAT_FS=m
476+
CONFIG_EXFAT_FS=m
475477
CONFIG_PROC_KCORE=y
476478
CONFIG_PROC_CHILDREN=y
477479
CONFIG_TMPFS=y
@@ -619,9 +621,11 @@ CONFIG_XZ_DEC_TEST=m
619621
CONFIG_STRING_SELFTEST=m
620622
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
621623
CONFIG_MAGIC_SYSRQ=y
624+
CONFIG_TEST_LOCKUP=m
622625
CONFIG_WW_MUTEX_SELFTEST=m
623626
CONFIG_EARLY_PRINTK=y
624627
CONFIG_TEST_LIST_SORT=m
628+
CONFIG_TEST_MIN_HEAP=m
625629
CONFIG_TEST_SORT=m
626630
CONFIG_REED_SOLOMON_TEST=m
627631
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ CONFIG_NF_CONNTRACK_SANE=m
9696
CONFIG_NF_CONNTRACK_SIP=m
9797
CONFIG_NF_CONNTRACK_TFTP=m
9898
CONFIG_NF_TABLES=m
99-
CONFIG_NF_TABLES_SET=m
10099
CONFIG_NF_TABLES_INET=y
101100
CONFIG_NF_TABLES_NETDEV=y
102101
CONFIG_NFT_NUMGEN=m
@@ -360,6 +359,7 @@ CONFIG_IPVLAN=m
360359
CONFIG_IPVTAP=m
361360
CONFIG_VXLAN=m
362361
CONFIG_GENEVE=m
362+
CONFIG_BAREUDP=m
363363
CONFIG_GTP=m
364364
CONFIG_MACSEC=m
365365
CONFIG_NETCONSOLE=m
@@ -408,6 +408,7 @@ CONFIG_RTC_CLASS=y
408408
# CONFIG_RTC_NVMEM is not set
409409
CONFIG_RTC_DRV_GENERIC=m
410410
# CONFIG_VIRTIO_MENU is not set
411+
# CONFIG_VHOST_MENU is not set
411412
# CONFIG_IOMMU_SUPPORT is not set
412413
CONFIG_DAX=m
413414
CONFIG_EXT4_FS=y
@@ -428,6 +429,7 @@ CONFIG_ZISOFS=y
428429
CONFIG_UDF_FS=m
429430
CONFIG_MSDOS_FS=m
430431
CONFIG_VFAT_FS=m
432+
CONFIG_EXFAT_FS=m
431433
CONFIG_PROC_KCORE=y
432434
CONFIG_PROC_CHILDREN=y
433435
CONFIG_TMPFS=y
@@ -575,9 +577,11 @@ CONFIG_XZ_DEC_TEST=m
575577
CONFIG_STRING_SELFTEST=m
576578
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
577579
CONFIG_MAGIC_SYSRQ=y
580+
CONFIG_TEST_LOCKUP=m
578581
CONFIG_WW_MUTEX_SELFTEST=m
579582
CONFIG_EARLY_PRINTK=y
580583
CONFIG_TEST_LIST_SORT=m
584+
CONFIG_TEST_MIN_HEAP=m
581585
CONFIG_TEST_SORT=m
582586
CONFIG_REED_SOLOMON_TEST=m
583587
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ CONFIG_NF_CONNTRACK_SANE=m
103103
CONFIG_NF_CONNTRACK_SIP=m
104104
CONFIG_NF_CONNTRACK_TFTP=m
105105
CONFIG_NF_TABLES=m
106-
CONFIG_NF_TABLES_SET=m
107106
CONFIG_NF_TABLES_INET=y
108107
CONFIG_NF_TABLES_NETDEV=y
109108
CONFIG_NFT_NUMGEN=m
@@ -376,6 +375,7 @@ CONFIG_IPVLAN=m
376375
CONFIG_IPVTAP=m
377376
CONFIG_VXLAN=m
378377
CONFIG_GENEVE=m
378+
CONFIG_BAREUDP=m
379379
CONFIG_GTP=m
380380
CONFIG_MACSEC=m
381381
CONFIG_NETCONSOLE=m
@@ -430,6 +430,7 @@ CONFIG_RTC_CLASS=y
430430
# CONFIG_RTC_NVMEM is not set
431431
CONFIG_RTC_DRV_GENERIC=m
432432
# CONFIG_VIRTIO_MENU is not set
433+
# CONFIG_VHOST_MENU is not set
433434
# CONFIG_IOMMU_SUPPORT is not set
434435
CONFIG_DAX=m
435436
CONFIG_EXT4_FS=y
@@ -450,6 +451,7 @@ CONFIG_ZISOFS=y
450451
CONFIG_UDF_FS=m
451452
CONFIG_MSDOS_FS=m
452453
CONFIG_VFAT_FS=m
454+
CONFIG_EXFAT_FS=m
453455
CONFIG_PROC_KCORE=y
454456
CONFIG_PROC_CHILDREN=y
455457
CONFIG_TMPFS=y
@@ -597,9 +599,11 @@ CONFIG_XZ_DEC_TEST=m
597599
CONFIG_STRING_SELFTEST=m
598600
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
599601
CONFIG_MAGIC_SYSRQ=y
602+
CONFIG_TEST_LOCKUP=m
600603
CONFIG_WW_MUTEX_SELFTEST=m
601604
CONFIG_EARLY_PRINTK=y
602605
CONFIG_TEST_LIST_SORT=m
606+
CONFIG_TEST_MIN_HEAP=m
603607
CONFIG_TEST_SORT=m
604608
CONFIG_REED_SOLOMON_TEST=m
605609
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m
9393
CONFIG_NF_CONNTRACK_SIP=m
9494
CONFIG_NF_CONNTRACK_TFTP=m
9595
CONFIG_NF_TABLES=m
96-
CONFIG_NF_TABLES_SET=m
9796
CONFIG_NF_TABLES_INET=y
9897
CONFIG_NF_TABLES_NETDEV=y
9998
CONFIG_NFT_NUMGEN=m
@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m
358357
CONFIG_IPVTAP=m
359358
CONFIG_VXLAN=m
360359
CONFIG_GENEVE=m
360+
CONFIG_BAREUDP=m
361361
CONFIG_GTP=m
362362
CONFIG_MACSEC=m
363363
CONFIG_NETCONSOLE=m
@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y
401401
# CONFIG_RTC_NVMEM is not set
402402
CONFIG_RTC_DRV_GENERIC=m
403403
# CONFIG_VIRTIO_MENU is not set
404+
# CONFIG_VHOST_MENU is not set
404405
# CONFIG_IOMMU_SUPPORT is not set
405406
CONFIG_DAX=m
406407
CONFIG_EXT4_FS=y
@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y
421422
CONFIG_UDF_FS=m
422423
CONFIG_MSDOS_FS=m
423424
CONFIG_VFAT_FS=m
425+
CONFIG_EXFAT_FS=m
424426
CONFIG_PROC_KCORE=y
425427
CONFIG_PROC_CHILDREN=y
426428
CONFIG_TMPFS=y
@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m
568570
CONFIG_STRING_SELFTEST=m
569571
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
570572
CONFIG_MAGIC_SYSRQ=y
573+
CONFIG_TEST_LOCKUP=m
571574
CONFIG_WW_MUTEX_SELFTEST=m
572575
CONFIG_EARLY_PRINTK=y
573576
CONFIG_TEST_LIST_SORT=m
577+
CONFIG_TEST_MIN_HEAP=m
574578
CONFIG_TEST_SORT=m
575579
CONFIG_REED_SOLOMON_TEST=m
576580
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ CONFIG_NF_CONNTRACK_SANE=m
9595
CONFIG_NF_CONNTRACK_SIP=m
9696
CONFIG_NF_CONNTRACK_TFTP=m
9797
CONFIG_NF_TABLES=m
98-
CONFIG_NF_TABLES_SET=m
9998
CONFIG_NF_TABLES_INET=y
10099
CONFIG_NF_TABLES_NETDEV=y
101100
CONFIG_NFT_NUMGEN=m
@@ -359,6 +358,7 @@ CONFIG_IPVLAN=m
359358
CONFIG_IPVTAP=m
360359
CONFIG_VXLAN=m
361360
CONFIG_GENEVE=m
361+
CONFIG_BAREUDP=m
362362
CONFIG_GTP=m
363363
CONFIG_MACSEC=m
364364
CONFIG_NETCONSOLE=m
@@ -410,6 +410,7 @@ CONFIG_RTC_CLASS=y
410410
# CONFIG_RTC_NVMEM is not set
411411
CONFIG_RTC_DRV_GENERIC=m
412412
# CONFIG_VIRTIO_MENU is not set
413+
# CONFIG_VHOST_MENU is not set
413414
# CONFIG_IOMMU_SUPPORT is not set
414415
CONFIG_DAX=m
415416
CONFIG_EXT4_FS=y
@@ -430,6 +431,7 @@ CONFIG_ZISOFS=y
430431
CONFIG_UDF_FS=m
431432
CONFIG_MSDOS_FS=m
432433
CONFIG_VFAT_FS=m
434+
CONFIG_EXFAT_FS=m
433435
CONFIG_PROC_KCORE=y
434436
CONFIG_PROC_CHILDREN=y
435437
CONFIG_TMPFS=y
@@ -577,9 +579,11 @@ CONFIG_XZ_DEC_TEST=m
577579
CONFIG_STRING_SELFTEST=m
578580
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
579581
CONFIG_MAGIC_SYSRQ=y
582+
CONFIG_TEST_LOCKUP=m
580583
CONFIG_WW_MUTEX_SELFTEST=m
581584
CONFIG_EARLY_PRINTK=y
582585
CONFIG_TEST_LIST_SORT=m
586+
CONFIG_TEST_MIN_HEAP=m
583587
CONFIG_TEST_SORT=m
584588
CONFIG_REED_SOLOMON_TEST=m
585589
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m
9494
CONFIG_NF_CONNTRACK_SIP=m
9595
CONFIG_NF_CONNTRACK_TFTP=m
9696
CONFIG_NF_TABLES=m
97-
CONFIG_NF_TABLES_SET=m
9897
CONFIG_NF_TABLES_INET=y
9998
CONFIG_NF_TABLES_NETDEV=y
10099
CONFIG_NFT_NUMGEN=m
@@ -375,6 +374,7 @@ CONFIG_IPVLAN=m
375374
CONFIG_IPVTAP=m
376375
CONFIG_VXLAN=m
377376
CONFIG_GENEVE=m
377+
CONFIG_BAREUDP=m
378378
CONFIG_GTP=m
379379
CONFIG_MACSEC=m
380380
CONFIG_NETCONSOLE=m
@@ -432,6 +432,7 @@ CONFIG_RTC_CLASS=y
432432
# CONFIG_RTC_NVMEM is not set
433433
CONFIG_RTC_DRV_GENERIC=m
434434
# CONFIG_VIRTIO_MENU is not set
435+
# CONFIG_VHOST_MENU is not set
435436
# CONFIG_IOMMU_SUPPORT is not set
436437
CONFIG_DAX=m
437438
CONFIG_EXT4_FS=y
@@ -452,6 +453,7 @@ CONFIG_ZISOFS=y
452453
CONFIG_UDF_FS=m
453454
CONFIG_MSDOS_FS=m
454455
CONFIG_VFAT_FS=m
456+
CONFIG_EXFAT_FS=m
455457
CONFIG_PROC_KCORE=y
456458
CONFIG_PROC_CHILDREN=y
457459
CONFIG_TMPFS=y
@@ -599,9 +601,11 @@ CONFIG_XZ_DEC_TEST=m
599601
CONFIG_STRING_SELFTEST=m
600602
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
601603
CONFIG_MAGIC_SYSRQ=y
604+
CONFIG_TEST_LOCKUP=m
602605
CONFIG_WW_MUTEX_SELFTEST=m
603606
CONFIG_EARLY_PRINTK=y
604607
CONFIG_TEST_LIST_SORT=m
608+
CONFIG_TEST_MIN_HEAP=m
605609
CONFIG_TEST_SORT=m
606610
CONFIG_REED_SOLOMON_TEST=m
607611
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ CONFIG_NF_CONNTRACK_SANE=m
114114
CONFIG_NF_CONNTRACK_SIP=m
115115
CONFIG_NF_CONNTRACK_TFTP=m
116116
CONFIG_NF_TABLES=m
117-
CONFIG_NF_TABLES_SET=m
118117
CONFIG_NF_TABLES_INET=y
119118
CONFIG_NF_TABLES_NETDEV=y
120119
CONFIG_NFT_NUMGEN=m
@@ -419,6 +418,7 @@ CONFIG_IPVLAN=m
419418
CONFIG_IPVTAP=m
420419
CONFIG_VXLAN=m
421420
CONFIG_GENEVE=m
421+
CONFIG_BAREUDP=m
422422
CONFIG_GTP=m
423423
CONFIG_MACSEC=m
424424
CONFIG_NETCONSOLE=m
@@ -518,6 +518,7 @@ CONFIG_RTC_DRV_MSM6242=m
518518
CONFIG_RTC_DRV_RP5C01=m
519519
CONFIG_RTC_DRV_GENERIC=m
520520
# CONFIG_VIRTIO_MENU is not set
521+
# CONFIG_VHOST_MENU is not set
521522
# CONFIG_IOMMU_SUPPORT is not set
522523
CONFIG_DAX=m
523524
CONFIG_EXT4_FS=y
@@ -538,6 +539,7 @@ CONFIG_ZISOFS=y
538539
CONFIG_UDF_FS=m
539540
CONFIG_MSDOS_FS=m
540541
CONFIG_VFAT_FS=m
542+
CONFIG_EXFAT_FS=m
541543
CONFIG_PROC_KCORE=y
542544
CONFIG_PROC_CHILDREN=y
543545
CONFIG_TMPFS=y
@@ -685,9 +687,11 @@ CONFIG_XZ_DEC_TEST=m
685687
CONFIG_STRING_SELFTEST=m
686688
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
687689
CONFIG_MAGIC_SYSRQ=y
690+
CONFIG_TEST_LOCKUP=m
688691
CONFIG_WW_MUTEX_SELFTEST=m
689692
CONFIG_EARLY_PRINTK=y
690693
CONFIG_TEST_LIST_SORT=m
694+
CONFIG_TEST_MIN_HEAP=m
691695
CONFIG_TEST_SORT=m
692696
CONFIG_REED_SOLOMON_TEST=m
693697
CONFIG_ATOMIC64_SELFTEST=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ CONFIG_NF_CONNTRACK_SANE=m
9292
CONFIG_NF_CONNTRACK_SIP=m
9393
CONFIG_NF_CONNTRACK_TFTP=m
9494
CONFIG_NF_TABLES=m
95-
CONFIG_NF_TABLES_SET=m
9695
CONFIG_NF_TABLES_INET=y
9796
CONFIG_NF_TABLES_NETDEV=y
9897
CONFIG_NFT_NUMGEN=m
@@ -357,6 +356,7 @@ CONFIG_IPVLAN=m
357356
CONFIG_IPVTAP=m
358357
CONFIG_VXLAN=m
359358
CONFIG_GENEVE=m
359+
CONFIG_BAREUDP=m
360360
CONFIG_GTP=m
361361
CONFIG_MACSEC=m
362362
CONFIG_NETCONSOLE=m
@@ -400,6 +400,7 @@ CONFIG_RTC_CLASS=y
400400
# CONFIG_RTC_NVMEM is not set
401401
CONFIG_RTC_DRV_GENERIC=m
402402
# CONFIG_VIRTIO_MENU is not set
403+
# CONFIG_VHOST_MENU is not set
403404
# CONFIG_IOMMU_SUPPORT is not set
404405
CONFIG_DAX=m
405406
CONFIG_EXT4_FS=y
@@ -420,6 +421,7 @@ CONFIG_ZISOFS=y
420421
CONFIG_UDF_FS=m
421422
CONFIG_MSDOS_FS=m
422423
CONFIG_VFAT_FS=m
424+
CONFIG_EXFAT_FS=m
423425
CONFIG_PROC_KCORE=y
424426
CONFIG_PROC_CHILDREN=y
425427
CONFIG_TMPFS=y
@@ -567,9 +569,11 @@ CONFIG_XZ_DEC_TEST=m
567569
CONFIG_STRING_SELFTEST=m
568570
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
569571
CONFIG_MAGIC_SYSRQ=y
572+
CONFIG_TEST_LOCKUP=m
570573
CONFIG_WW_MUTEX_SELFTEST=m
571574
CONFIG_EARLY_PRINTK=y
572575
CONFIG_TEST_LIST_SORT=m
576+
CONFIG_TEST_MIN_HEAP=m
573577
CONFIG_TEST_SORT=m
574578
CONFIG_REED_SOLOMON_TEST=m
575579
CONFIG_ATOMIC64_SELFTEST=m

0 commit comments

Comments
 (0)