Merge tag 'x86_vmware_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 16:13:43 +0000 (09:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 16:13:43 +0000 (09:13 -0700)
commit47e12f14108170c36af9a0ee2271abb3dfb73e0e
treef9da47dc43f900e0fb2ec6d9e461fe6dcab28897
parent26a4ef7e481c9d70d2e0cf0be1ad37279fe0b6de
parent0b4a285e2c65c2c9449c6eccb87298e385213e7b
Merge tag 'x86_vmware_for_v5.13' of git://git./linux/kernel/git/tip/tip

Pull x86 vmware guest update from Borislav Petkov:
 "Have vmware guests skip the refined TSC calibration when the TSC
  frequency has been retrieved from the hypervisor"

* tag 'x86_vmware_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vmware: Avoid TSC recalibration when frequency is known
arch/x86/kernel/cpu/vmware.c