]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jun 2019 18:10:01 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jun 2019 18:10:01 +0000 (11:10 -0700)
Pull x86 fixes from Ingo Molnar:
 "Two fixes: a quirk for KVM guests running on certain AMD CPUs, and a
  KASAN related build fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/CPU/AMD: Don't force the CPB cap when running under a hypervisor
  x86/boot: Provide KASAN compatible aliases for string routines


Trivial merge