From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 May 2019 21:26:11 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.1~3
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/13369e831173251e2bc3bc2a78f67c387e8d9609

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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
---

13369e831173251e2bc3bc2a78f67c387e8d9609