Merge tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Apr 2021 16:03:49 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 12 Apr 2021 16:03:49 +0000 (09:03 -0700)
commit89698becf06d341a700913c3d89ce2a914af69a2
tree75e7b671226a5f533ff139a0b2f5378e43f1ef07
parentd434405aaab7d0ebc516b68a8fc4100922d7f5ef
parentd2bd44c4c05d043fb65cfdf26c54e6d8b94a4b41
Merge tag 'm68knommu-for-v5.12-rc7' of git://git./linux/kernel/git/gerg/m68knommu

Pull m68knommu fix from Greg Ungerer:
 "Some m68k platforms with a non-zero memory base fail to boot with the
  recent flatmem changes.

  This is a single regression fix to the pfn offset for that case"

* tag 'm68knommu-for-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: fix flatmem memory model setup