From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 12 Oct 2020 17:10:56 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~2768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af9db1d6632b726a2351426ab8f34374f6f38690;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'm68k-for-v5.10-tag1' of git://git./linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

  - Conversion of the Mac IDE driver to a platform driver

  - Minor cleanups and fixes

* tag 'm68k-for-v5.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  ide/macide: Convert Mac IDE driver to platform driver
  m68k: Replace HTTP links with HTTPS ones
  m68k: mm: Remove superfluous memblock_alloc*() casts
  m68k: mm: Use PAGE_ALIGNED() helper
  m68k: Sort selects in main Kconfig
  m68k: amiga: Clean up Amiga hardware configuration
  m68k: Revive _TIF_* masks
  m68k: Correct some typos in comments
  m68k: Use get_kernel_nofault() in show_registers()
  zorro: Fix address space collision message with RAM expansion boards
  m68k: amiga: Fix Denise detection on OCS
---

af9db1d6632b726a2351426ab8f34374f6f38690