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

Pull m68k updates from Geert Uytterhoeven:

  - Fix whitespace in Zorro name macros

  - Fix find_*_bit() signatures

  - defconfig updates

* tag 'm68k-for-v6.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.17-rc1
  m68k: bitops: Fix find_*_bit() signatures
  zorro: Remove extra whitespace in macro definitions

diff --cc arch/m68k/configs/amiga_defconfig
Simple merge

diff --cc arch/m68k/configs/apollo_defconfig
Simple merge

diff --cc arch/m68k/configs/atari_defconfig
Simple merge

diff --cc arch/m68k/configs/bvme6000_defconfig
Simple merge

diff --cc arch/m68k/configs/hp300_defconfig
Simple merge

diff --cc arch/m68k/configs/mac_defconfig
Simple merge

diff --cc arch/m68k/configs/multi_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme147_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme16x_defconfig
Simple merge

diff --cc arch/m68k/configs/q40_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3x_defconfig
Simple merge

diff --cc arch/m68k/include/asm/bitops.h
Simple merge