Merge tag 'fixes-2020-11-05' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2020 18:57:01 +0000 (10:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2020 18:57:01 +0000 (10:57 -0800)
commit1a092479f3032a0e155448062ba5e36aa61e2c32
tree3349bc7f8085fe664ce118c08d972744d901b926
parentd1dd461207b8d1dbeaadf1e0b4e85b833c3a7c1c
parentb9bc36704cca500e2b41be4c5bf615c1d7ddc3ce
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