From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Nov 2020 18:57:01 +0000 (-0800)
Subject: Merge tag 'fixes-2020-11-05' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a092479f3032a0e155448062ba5e36aa61e2c32;p=linux.git

Merge tag 'fixes-2020-11-05' of git://git./linux/kernel/git/rppt/memblock

Pull highmem initialization fix from Mike Rapoport:
 "Fix highmem initialization on arm and xtensa

  Recent refactoring of memblock iterators has broken initialization of
  highmem on arm and xtensa because it changed the way beginning and end
  of memory regions are rounded to PFNs. This fix restores the original
  behaviour"

* tag 'fixes-2020-11-05' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations
---

1a092479f3032a0e155448062ba5e36aa61e2c32