Commit 3ee3723b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4e909124 3381df09

arch/m68k/amiga/config.c

+4 −3
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static void __init amiga_identify(void) 
	case AMI_1200:

		AMIGAHW_SET(A1200_IDE);

		AMIGAHW_SET(PCMCIA);

		fallthrough;

	case AMI_500:

	case AMI_500PLUS:

	case AMI_1000:
@@ -233,7 +234,7 @@ static void __init amiga_identify(void) 
	case AMI_3000T:

		AMIGAHW_SET(AMBER_FF);

		AMIGAHW_SET(MAGIC_REKICK);

		/* fall through */

		fallthrough;

	case AMI_3000PLUS:

		AMIGAHW_SET(A3000_SCSI);

		AMIGAHW_SET(A3000_CLK);
@@ -242,7 +243,7 @@ static void __init amiga_identify(void) 


	case AMI_4000T:

		AMIGAHW_SET(A4000_SCSI);

		/* fall through */

		fallthrough;

	case AMI_4000:

		AMIGAHW_SET(A4000_IDE);

		AMIGAHW_SET(A3000_CLK);
@@ -628,7 +629,7 @@ struct savekmsg { 
	unsigned long magic2;		/* SAVEKMSG_MAGIC2 */

	unsigned long magicptr;		/* address of magic1 */

	unsigned long size;

	char data[0];

	char data[];

};



static struct savekmsg *savekmsg;

arch/m68k/configs/amiga_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_SET=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_NUMGEN=m
@@ -381,6 +380,7 @@ CONFIG_IPVLAN=m 
CONFIG_IPVTAP=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_BAREUDP=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m
@@ -452,6 +452,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_MSM6242=m

CONFIG_RTC_DRV_RP5C01=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_EXT4_FS=y
@@ -472,6 +473,7 @@ CONFIG_ZISOFS=y 
CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -619,9 +621,11 @@ CONFIG_XZ_DEC_TEST=m 
CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_TEST_LOCKUP=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

arch/m68k/configs/apollo_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_SET=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_NUMGEN=m
@@ -360,6 +359,7 @@ CONFIG_IPVLAN=m 
CONFIG_IPVTAP=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_BAREUDP=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m
@@ -408,6 +408,7 @@ CONFIG_RTC_CLASS=y 
# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_EXT4_FS=y
@@ -428,6 +429,7 @@ CONFIG_ZISOFS=y 
CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -575,9 +577,11 @@ CONFIG_XZ_DEC_TEST=m 
CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_TEST_LOCKUP=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

arch/m68k/configs/atari_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_SET=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_NUMGEN=m
@@ -376,6 +375,7 @@ CONFIG_IPVLAN=m 
CONFIG_IPVTAP=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_BAREUDP=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m
@@ -430,6 +430,7 @@ CONFIG_RTC_CLASS=y 
# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_EXT4_FS=y
@@ -450,6 +451,7 @@ CONFIG_ZISOFS=y 
CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -597,9 +599,11 @@ CONFIG_XZ_DEC_TEST=m 
CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_TEST_LOCKUP=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

arch/m68k/configs/bvme6000_defconfig

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m 
CONFIG_NF_CONNTRACK_SIP=m

CONFIG_NF_CONNTRACK_TFTP=m

CONFIG_NF_TABLES=m

CONFIG_NF_TABLES_SET=m

CONFIG_NF_TABLES_INET=y

CONFIG_NF_TABLES_NETDEV=y

CONFIG_NFT_NUMGEN=m
@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m 
CONFIG_IPVTAP=m

CONFIG_VXLAN=m

CONFIG_GENEVE=m

CONFIG_BAREUDP=m

CONFIG_GTP=m

CONFIG_MACSEC=m

CONFIG_NETCONSOLE=m
@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y 
# CONFIG_RTC_NVMEM is not set

CONFIG_RTC_DRV_GENERIC=m

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_DAX=m

CONFIG_EXT4_FS=y
@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y 
CONFIG_UDF_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_EXFAT_FS=m

CONFIG_PROC_KCORE=y

CONFIG_PROC_CHILDREN=y

CONFIG_TMPFS=y
@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m 
CONFIG_STRING_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_TEST_LOCKUP=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_MIN_HEAP=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_ATOMIC64_SELFTEST=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE