Merge tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2021 19:17:18 +0000 (11:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2021 19:17:18 +0000 (11:17 -0800)
Pull ia64 build fix from Mike Rapoport:
 "Fix an ia64 build failure caused by memory model changes"

* tag 'fixes-2021-01-18' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  ia64: fix build failure caused by memory model changes


Trivial merge