Re: [PATCH] KVM, SEV: fix merge conflict

[Sean Christopherson]

On Tue, May 19, 2026, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
> 
> A conflict between two patches leads to build failure for
> the reference countingg in 'struct kvm', which moved into
> the kvm_refcount structure:
> 
> arch/x86/kvm/svm/sev.c: In function 'kvm_lockdep_assert_sev_lock_held':
> arch/x86/kvm/svm/sev.c:118:32: error: 'struct kvm' has no member named 'users_count'
>   118 |         if (!refcount_read(&kvm->users_count))
> 
> Resolve this by changing the added reference the same way as
> the other ones.
> 
> Fixes: 422c363f58a8 ("KVM, vfio: remove symbol_get(kvm_get_kvm_safe) from vfio")

This isn't a merge conflict, it's a bug in wherever this commit is coming from.

> Fixes: ba903f738249 ("KVM: SEV: Assert that kvm->lock is held when querying SEV+ support")

Because this commit has been in Linus' tree since 7.1-rc1.