Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 May 2019 21:26:11 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 May 2019 21:26:11 +0000 (14:26 -0700)
commit13369e831173251e2bc3bc2a78f67c387e8d9609
tree808ee4905d77f516403baaa9fd461a4b2bcceaf3
parent51987affd626b8e4ce9f4c65e1950cb9159f0f58
parentb51ce3744f115850166f3d6c292b9c8cb849ad4f
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fix from Ingo Molnar:
 "Disable function tracing during early SME setup to fix a boot crash on
  SME-enabled kernels running distro kernels (some of which have
  function tracing enabled)"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/mem_encrypt: Disable all instrumentation for early SME setup