Merge tag 'fixes-2020-08-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Aug 2020 19:05:46 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Aug 2020 19:05:46 +0000 (12:05 -0700)
commit9899b587588fb6ced0597e188e049f1ab92c7003
treea1eb53c628e400f4fc12467f11cfefeadda89386
parentb7333b58f358f38d90d78e00c1ee5dec82df10ad
parentbd05220c7be3356046861c317d9c287ca50445ba
Merge tag 'fixes-2020-08-18' of git://git./linux/kernel/git/rppt/memblock

Pull ia64 page table fix from Mike Rapoport:
 "Fix regression in IA-64 caused by page table allocation refactoring

  The refactoring and consolidation of <asm/pgalloc.h> caused regression
  on parisc and ia64. The fix for parisc made it into v5.9-rc1 while the
  fix ia64 got delayed a bit and here it is"

* tag 'fixes-2020-08-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  arch/ia64: Restore arch-specific pgd_offset_k implementation