Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Aug 2018 16:39:30 +0000 (09:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Aug 2018 16:39:30 +0000 (09:39 -0700)
commita8c199208cd68cc2d71684d84e37e3b56a2ae640
tree81f1e6c897a96f518a602fb431a8ad1f227f3e3e
parent2f3672cbf9da468340a540fc23cefdd81c0b7be3
parent1b3a62643660020cdc68e6139a010c06e8fc96c7
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "A single fix, which addresses boot failures on machines which do not
  report EBDA correctly, which can place the trampoline into reserved
  memory regions. Validating against E820 prevents that"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/compressed/64: Validate trampoline placement against E820