On 14/01/20 10:39, Borislav Petkov wrote:
> JFYI: there'll be a merge conflict, below is me merging into linux-next
> from today.
>
> Also, don't forget to fixup CPU_BASED_USE_TSC_OFFSETTING with "TT" since
> you hav e
>
> 5e3d394fdd9e ("KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING")
>
> in your tree but this tree still has:
>
> + #define CPU_BASED_USE_TSC_OFFSETING VMCS_CONTROL_BIT(TSC_OFFSETTING)
>
> Lemme know if there's something else I should do.
Nope, thanks for the heads up. The topic branch will remove the need
for Linus to solve the conflict so it's definitely the way to go.
Paolo
