Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jul 2017 19:19:35 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Jul 2017 19:19:35 +0000 (12:19 -0700)
commitf137e0b0c5903d4a12ed2954c64924e4a979232d
tree2e94460cf00be892354fee0803d3daa628a97fba
parente4776b8ccbdc4b8a0744641cd66197a91ec37689
parent20c6c189045539d29f4854d92b7ea9c329e1edfc
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Thomas Gleixner:
 "A small set of x86 fixes:

   - prevent the kernel from using the EFI reboot method when EFI is
     disabled.

   - two patches addressing clang issues"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Disable the address-of-packed-member compiler warning
  x86/efi: Fix reboot_mode when EFI runtime services are disabled
  x86/boot: #undef memcpy() et al in string.c