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 4266B3750C3 for ; Wed, 4 Mar 2026 23:10:17 +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=1772665818; cv=none; b=Sna4v3GqHmag0Ysco/jB+EA/4DOceWpjLRSsJZyypLMLovNljWXXEHmtNu5fuKLkNO0qvLT9xaz2PKFhFQClNbilDPc6mXSeWnRrmZy4DzHvcJ87KW6Fa+AMm1P9yaDerHMTErubgL2jxHTykudx5wYq91JndioKMG4SearIKJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772665818; c=relaxed/simple; bh=VUl964ADNV7dJBs7RYQP6M1mi+4Su/GHaEbhIxBiJls=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JPgNLLlM5sO4IHmjzjLVX1Zxu8kAdaxrjvfMaxQ0KykhAohNEQPPt51AsD0dQ78JmqXbu+Rebh+/1K53bVDax0URefhJ//b8pLWpIrS/BiUmBlHjJzMPTHvW0slIn1iJkUnmaCeLC43UHUaez1WTZhqIobFUonbrl6tXOoa83qs= 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=Acn+MqvL; 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="Acn+MqvL" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2ae405e95f5so47573735ad.2 for ; Wed, 04 Mar 2026 15:10:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772665817; x=1773270617; 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=RRrSt8+qsqZxXShVCzBNNFXHtGWznhPr2HpI/zM2u1Q=; b=Acn+MqvLEAF8f2rnQ4/9Zrb9w7YasP431qa/psE4SewVKk7/9k02Ad6y3wEArlftnt 5u+nWxgaZUFpfgQElwnz1+lZSr4wXj+dHow6Mrmj6m9rX+/st1i+skviyBtDj/ErVXMk XW3IuCTKyt85TlbWXFgKm3lry1Fk9V4ppsSpGB/ZqefLcYryH5f3yDvssAnNClT1x470 h3wEBO5UOCu/ux/oUjsEdnv8GHiHShlqZCt6XWAYOjsaRaXCUbnh9lrkv3/iPQyOxW7t zP671NfZW8sS3hohPEJn2XwOTJHP4VGVlbVS8NlKA9kdBgyfns9KQBLdJK2mYFXqZArg KZ1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772665817; x=1773270617; 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=RRrSt8+qsqZxXShVCzBNNFXHtGWznhPr2HpI/zM2u1Q=; b=npyF8GDWjJ38kF7YUpdRlpYFWmGLG1IO5814MwxDgivKi3FXcLElG+iBN1WW2Wwv5Z jWX3qCK0Fdjga67DW/426K2/7j7YxZaeZojCDDJrPGqgBZ2AYwC0u2GAX6gfUJdQ7bxQ SyNn1Vd1CBL7O/cxiX5HHjHSx/9ny7WUrqdldEo/rDyyzP/J0+xXfAZu9oWLDcsicuiI M49ZPyVGZUWTMmr6r5EMxugnEnpF5WHHQq1UuZuRVwQmM1rvPEg9mqqz4qQgi3x/S5kE SviT7ov0ALxpMB4sMvlzh9asRQBZ46t0IkgTudzVk5FcoQ9AdCkK4MGNd+kLZqqbne3y +Mjg== X-Forwarded-Encrypted: i=1; AJvYcCUmo31siMMTvxsyc2BeEq57M6KqHmOxJL2ANWHBeuc/XNdiCgnWhM7RYuQS7OW7kwXcaY3b5gNE7LsEB6k=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/gvwAGF4qmdvCJ/J19MjaA9q6QLchAd/HPCtX9oIi6KSOK5Lz bZiX/BA7mEaaT6F2f06VOkGWIU0nXUsJJbPNYLGjzAdzPK5AzcLr8aH21SYjp7BZkY93Vzh6Xg1 xxp3wkA== X-Received: from plsq1.prod.google.com ([2002:a17:902:bd81:b0:2a0:835a:fa57]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:d60f:b0:2ad:9421:6136 with SMTP id d9443c01a7336-2ae6aa02975mr39209415ad.1.1772665816428; Wed, 04 Mar 2026 15:10:16 -0800 (PST) Date: Wed, 4 Mar 2026 15:10:14 -0800 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the tip tree From: Sean Christopherson To: Mark Brown Cc: Chao Gao , Dave Hansen , Linux Kernel Mailing List , Linux Next Mailing List , Vishal Verma Content-Type: text/plain; charset="us-ascii" On Wed, Mar 04, 2026, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the kvm-x86 tree got a conflict in: > > arch/x86/virt/vmx/tdx/tdx_global_metadata.c > > between commit: > > 311214bf1df4b ("x86/virt/tdx: Retrieve TDX module version") > > from the tip tree and commit: > > 75b6c694eaed4 ("x86/virt/tdx: Tag a pile of functions as __init, and globals as __ro_after_init") > > from the kvm-x86 tree. > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > diff --cc arch/x86/virt/vmx/tdx/tdx_global_metadata.c > index 4c9917a9c2c39,360963bc9328f..0000000000000 > --- a/arch/x86/virt/vmx/tdx/tdx_global_metadata.c > +++ b/arch/x86/virt/vmx/tdx/tdx_global_metadata.c > @@@ -7,22 -7,7 +7,22 @@@ > * Include this file to other C file instead. > */ > > +static int get_tdx_sys_info_version(struct tdx_sys_info_version *sysinfo_version) Functionally this is a-ok, but we should remember to mention to Linus (and Paolo) that this can be marked __init when the two branches get smushed together. Thanks Mark! > +{ > + int ret = 0; > + u64 val; > + > + if (!ret && !(ret = read_sys_metadata_field(0x0800000100000003, &val))) > + sysinfo_version->minor_version = val; > + if (!ret && !(ret = read_sys_metadata_field(0x0800000100000004, &val))) > + sysinfo_version->major_version = val; > + if (!ret && !(ret = read_sys_metadata_field(0x0800000100000005, &val))) > + sysinfo_version->update_version = val; > + > + return ret; > +} > + > - static int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_features) > + static __init int get_tdx_sys_info_features(struct tdx_sys_info_features *sysinfo_features) > { > int ret = 0; > u64 val;