From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD4FB3890EF for ; Tue, 19 May 2026 21:26:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779226021; cv=none; b=NTc+KrstcycZsZjlDN+dbVQ2Z1dK9k4awgNzoHzE+E+3eAN1qzmAWRfGFVyA4BR+ZnitfWWU6b6YFW2thGhgZ1ezDafygYDRsk/9QKE7iJom5YTmx7EOrb8IpYU0ABWRsUXUKUQCr666lJYETHrdoxgjShezCqz2AMgonVFzXfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779226021; c=relaxed/simple; bh=QW98c0EO5p8OfysXhROXrzCpSjihaq1a/XqjsKWTkuI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rjc+rNp8sCIpwy+ia5RXse7ajw5vzxW7+G++sgdpb/nXVMfba/QHolCo+uBpEuZTaTYcjUyR2v3klVL1qOSTwa29ZJIwuj0Kq0dh7XkyipL5rPIc7ceg7P44KInygP7FKT0hOhIn7IT5dQK3iWU5aiMRnXdm6PIyefSUIpWC+n0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LQI9NLVa; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LQI9NLVa" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b9a3c3c4eeso41695785ad.3 for ; Tue, 19 May 2026 14:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779226019; x=1779830819; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=RdKp/MEfbZ+KU36s0cohlMKlKnHoAQty64EupqgsQ/s=; b=LQI9NLVa1rJpcfzHT8M2Z8KArLcqGKIIHJeUoRuWdjP9yg8IGpJiDQ/+UyHYqrHqOm 53YofhIiWprj1Ge193KZDji/6VFVaX7SAIMwy0dNX6GgNLrtt2TTQgG1QgudHjVYTVMg XQC7VksqAAUGMP9WUTee/wbJSa+dtCNsP+lUjy4Cn5ibfrjU9rqAWmGVE73hNv+XNGqp VnTXX37wiVIY9TxLx0anpdW+n5XDykswPRI+pySAWXkQVLDX8weVlgZRCPsN8Ly+wo6V EkIgKUtt8MnnchdBlKFrZWbLlkKd2AJGSb23scglWL1rW74W66/wtIIdNgw8ydfg8hxv DlkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779226019; x=1779830819; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=RdKp/MEfbZ+KU36s0cohlMKlKnHoAQty64EupqgsQ/s=; b=HZc3Z4o3wVreHN7oG6Ha4Q0lX5TPqg8RWufheDS4sBNY8TUN/yW9jTNwGoz+u9DxEq SzYdQmSgo0xUR9jreyAY17iZmH7VYgAqltIPpjPXKUGKpF0dxpRP81bTAM+rE3LvK325 PaGC8qoYbKk1DexXOPS0d/iXw0z3vwVSd5yXxjP/eq69GLLPIVo85boFVUKlwuoltBys R1fj7DK5ASGm+eWzyUoFL64U/OwlIZVKNmOY4eTI3fn7rV3dRbiJrMw5alOfcSrw8re0 XQOMlNJNBnlM1awJunz4DB/96ZS2qbFV1NVRM1/G7OMcMipo4pQazoC9a9NqpNHPJS0/ +Ueg== X-Forwarded-Encrypted: i=1; AFNElJ8WNLtZNRXmFtljXLnDwbtGFDeTHZSoEtqfkNp8jfd2gRiPTHJ3pEUifGze14WFo8R4Ft0xdHhblziYHbY=@vger.kernel.org X-Gm-Message-State: AOJu0YyPIefTSWs2LsZRoOCe5qOnqe7Jq0l0IExfK7OZBTsHceQDdUDD QmUlGztwG89HVC3iPgHwxuBLd8oiGnCkwgmolr7SjzHxS7r+EPIIEOl3oyVmbnMHHQNSXM8ztOy Ml0q5gA== X-Received: from plcl4.prod.google.com ([2002:a17:902:e2c4:b0:2b2:c88b:31b8]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:da90:b0:2bd:612b:912d with SMTP id d9443c01a7336-2bd7e8ad548mr220905995ad.14.1779226019010; Tue, 19 May 2026 14:26:59 -0700 (PDT) Date: Tue, 19 May 2026 14:26:58 -0700 In-Reply-To: <20260519202851.1339906-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260519202851.1339906-1-arnd@kernel.org> Message-ID: Subject: Re: [PATCH] KVM, SEV: fix merge conflict From: Sean Christopherson To: Arnd Bergmann Cc: Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Alex Williamson , Steffen Eiden , Arnd Bergmann , "H. Peter Anvin" , Tom Lendacky , Liam Merwick , Michael Roth , Nikunj A Dadhania , Maxim Levitsky , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" On Tue, May 19, 2026, Arnd Bergmann wrote: > From: Arnd Bergmann > > 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.