[git pull] m68k updates for 5.4

[git pull] m68k updates for 5.4

[Geert Uytterhoeven]

	Hi Linus,

The following changes since commit 609488bc979f99f805f34e9a32c1e3b71179d10b:

  Linux 5.3-rc2 (2019-07-28 12:47:02 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git tags/m68k-for-v5.4-tag1

for you to fetch changes up to 0f1979b402df5f0dd86425830ddaa191d70f3655:

  m68k: Remove ioremap_fullcache() (2019-09-02 09:50:26 +0200)

----------------------------------------------------------------
m68k updates for v5.4

  - ioremap() cleanups,
  - Defconfig updates,
  - Small fixes and cleanups.

----------------------------------------------------------------
Christoph Hellwig (2):
      m68k: Simplify ioremap_nocache()
      m68k: Remove ioremap_fullcache()

Finn Thain (2):
      m68k: mac: Revisit floppy disc controller base addresses
      m68k: Prevent some compiler warnings in Coldfire builds

Geert Uytterhoeven (2):
      m68k: atari: Rename shifter to shifter_st to avoid conflict
      m68k: defconfig: Update defconfigs for v5.3-rc2

 arch/m68k/atari/config.c             |   6 +-
 arch/m68k/configs/amiga_defconfig    |  13 +++-
 arch/m68k/configs/apollo_defconfig   |  13 +++-
 arch/m68k/configs/atari_defconfig    |  13 +++-
 arch/m68k/configs/bvme6000_defconfig |  13 +++-
 arch/m68k/configs/hp300_defconfig    |  13 +++-
 arch/m68k/configs/mac_defconfig      |  13 +++-
 arch/m68k/configs/multi_defconfig    |  13 +++-
 arch/m68k/configs/mvme147_defconfig  |  13 +++-
 arch/m68k/configs/mvme16x_defconfig  |  13 +++-
 arch/m68k/configs/q40_defconfig      |  13 +++-
 arch/m68k/configs/sun3_defconfig     |  13 +++-
 arch/m68k/configs/sun3x_defconfig    |  13 +++-
 arch/m68k/include/asm/atarihw.h      |  13 +---
 arch/m68k/include/asm/io_mm.h        |   6 +-
 arch/m68k/include/asm/kmap.h         |  17 +----
 arch/m68k/include/asm/macintosh.h    |  11 +--
 arch/m68k/mac/config.c               | 128 +++++++++++++++++------------------
 drivers/video/fbdev/atafb.c          |  42 ++++++------
 19 files changed, 223 insertions(+), 156 deletions(-)

Thanks for pulling!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: [git pull] m68k updates for 5.4

[pr-tracker-bot]

The pull request you sent on Mon, 16 Sep 2019 10:42:15 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git tags/m68k-for-v5.4-tag1

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/dbcda58ad98936079c48728c12c27a2f333fb484

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker