From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Jun 2019 18:10:01 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~6231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bd1d5edd0160b615ab8748cf94dabcab1fb01cb;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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
---

7bd1d5edd0160b615ab8748cf94dabcab1fb01cb