Commit 27bd3ce4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68k-for-v6.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - misc fixes and improvements

  - defconfig updates

* tag 'm68k-for-v6.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.14-rc1
  m68k: setup: Remove size argument when calling strscpy()
  m68k: sun3: Fix DEBUG_MMU_EMU build
  m68k: sun3: Use str_read_write() helper in mmu_emu_handle_fault()
parents 0d86c239 c94cf023

arch/m68k/configs/amiga_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ CONFIG_NET_IFE=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_DM_KUNIT_TEST=m

CONFIG_CONNECTOR=m

CONFIG_PARPORT=m

CONFIG_PARPORT_AMIGA=m
@@ -336,6 +335,7 @@ CONFIG_ATA=y 
CONFIG_PATA_GAYLE=y

CONFIG_PATA_BUDDHA=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

arch/m68k/configs/apollo_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ CONFIG_NET_IFE=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_DM_KUNIT_TEST=m

CONFIG_CONNECTOR=m

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y
@@ -316,6 +315,7 @@ CONFIG_SCSI_SAS_ATTRS=m 
CONFIG_ISCSI_TCP=m

CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

arch/m68k/configs/atari_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ CONFIG_NET_IFE=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_DM_KUNIT_TEST=m

CONFIG_CONNECTOR=m

CONFIG_PARPORT=m

CONFIG_PARPORT_ATARI=m
@@ -331,6 +330,7 @@ CONFIG_ATA=y 
# CONFIG_ATA_BMDMA is not set

CONFIG_PATA_FALCON=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

arch/m68k/configs/bvme6000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ CONFIG_NET_IFE=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_DM_KUNIT_TEST=m

CONFIG_CONNECTOR=m

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y
@@ -314,6 +313,7 @@ CONFIG_ISCSI_TCP=m 
CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_BVME6000_SCSI=y

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m

arch/m68k/configs/hp300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ CONFIG_NET_IFE=m 
CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_TEST_ASYNC_DRIVER_PROBE=m

CONFIG_DM_KUNIT_TEST=m

CONFIG_CONNECTOR=m

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y
@@ -315,6 +314,7 @@ CONFIG_SCSI_SAS_ATTRS=m 
CONFIG_ISCSI_TCP=m

CONFIG_ISCSI_BOOT_SYSFS=m

CONFIG_MD=y

CONFIG_MD_LINEAR=m

CONFIG_BLK_DEV_DM=m

CONFIG_DM_UNSTRIPED=m

CONFIG_DM_CRYPT=m