From: "Arnd Bergmann" <arnd@arndb.de>
To: "Sean Christopherson" <seanjc@google.com>,
"Arnd Bergmann" <arnd@kernel.org>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Gleixner" <tglx@kernel.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
x86@kernel.org, "Alex Williamson" <alex@shazbot.org>,
"Steffen Eiden" <seiden@linux.ibm.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"Liam Merwick" <liam.merwick@oracle.com>,
"Michael Roth" <michael.roth@amd.com>,
"Nikunj A Dadhania" <nikunj@amd.com>,
"Maxim Levitsky" <mlevitsk@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] KVM, SEV: fix merge conflict
Date: Wed, 20 May 2026 07:50:05 +0200 [thread overview]
Message-ID: <f27f2ca3-2c82-4bd2-b270-34ccb0d081ab@app.fastmail.com> (raw)
In-Reply-To: <agzVorbOnlwczjP-@google.com>
On Tue, May 19, 2026, at 23:26, Sean Christopherson wrote:
> On Tue, May 19, 2026, Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> 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.
Right, my mistake, it's from a branch that is not in linux-next
yet, and I did the merge myself.
Sorry for the false report.
Arnd
next prev parent reply other threads:[~2026-05-20 5:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-19 20:28 Arnd Bergmann
2026-05-19 21:26 ` Sean Christopherson
2026-05-20 5:50 ` Arnd Bergmann [this message]
2026-05-20 3:41 ` kernel test robot
2026-05-20 4:15 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f27f2ca3-2c82-4bd2-b270-34ccb0d081ab@app.fastmail.com \
--to=arnd@arndb.de \
--cc=alex@shazbot.org \
--cc=arnd@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=liam.merwick@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=mingo@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=nikunj@amd.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=seiden@linux.ibm.com \
--cc=tglx@kernel.org \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome