tree 6216bebf8665e3aee2c9a47972d36d9761086543
parent c6ac7188c1142c450eb601563ad69204bf1e9286
parent 870b4333a62e45b0b2000d14b301b7b8b8cad9da
author Linus Torvalds <torvalds@linux-foundation.org> 1585069066 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1585069066 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Ingo Molnar:
 "A build fix with certain Kconfig combinations"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioremap: Fix CONFIG_EFI=n build