diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-05 14:26:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-05 14:26:11 -0700 |
commit | 13369e831173251e2bc3bc2a78f67c387e8d9609 (patch) | |
tree | 808ee4905d77f516403baaa9fd461a4b2bcceaf3 /drivers/net/vrf.c | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
parent | x86/mm/mem_encrypt: Disable all instrumentation for early SME setup (diff) | |
download | linux-dev-13369e831173251e2bc3bc2a78f67c387e8d9609.tar.xz linux-dev-13369e831173251e2bc3bc2a78f67c387e8d9609.zip |
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
Diffstat (limited to 'drivers/net/vrf.c')
0 files changed, 0 insertions, 0 deletions