summary refs log tree commit diff
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-14 16:20:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-14 16:20:48 -0800
commit0b03beface02d519693edb8020f9811c67d5c88f (patch)
treee69b63da6b4fa28fd70205187c699aecf1b1128e /arch/s390/kernel
parent2c075f38a708c578a752b738a45e8c26923eac2e (diff)
parent2ae92e8b9b7eb042ccb7e9fc7ea9431f211a1bd3 (diff)
downloadlinux-0b03beface02d519693edb8020f9811c67d5c88f.tar.gz
Merge tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:

 - fix WARNING splat in pmac_zilog driver

 - fix ADB input device regression

 - assume maintainership for adb-iop and via-macii

 - minor fixes and improvements

 - defconfig updates

* tag 'm68k-for-v5.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  MAINTAINERS: Update m68k Mac entry
  macintosh/adb-iop: Send correct poll command
  macintosh/adb-iop: Always wait for reply message from IOP
  m68k: Fix WARNING splat in pmac_zilog driver
  m68k: Add a missing ELF_DETAILS in link script
  m68k: Drop redundant NOTES in link script
  m68k: mac: Update Kconfig help
  m68k: mac: Remove redundant VIA register writes
  m68k: mac: Remove dead code
  m68k: mac: Refactor iop_preinit() and iop_init()
  m68k: defconfig: Enable KUnit tests
  m68k: defconfig: Update defconfigs for v5.10-rc1
  m68k: Remove unused mach_max_dma_address
  m68k: Avoid xchg() warning
Diffstat (limited to 'arch/s390/kernel')
0 files changed, 0 insertions, 0 deletions