From: Mark Brown <broonie@kernel•org>
To: Sean Christopherson <seanjc@google•com>
Cc: Dave Hansen <dave.hansen@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel•com>,
Vishal Verma <vishal.l.verma@intel•com>
Subject: linux-next: manual merge of the kvm-x86 tree with the tip tree
Date: Mon, 18 May 2026 17:10:36 +0100 [thread overview]
Message-ID: <ags5_LIZq2DlzmAN@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
Hi all,
Today's linux-next merge of the kvm-x86 tree got a conflict in:
arch/x86/include/asm/tdx.h
between commit:
b7d2173946efa ("x86/virt/tdx: Add SEAMCALL wrapper for TDH.SYS.DISABLE")
from the tip tree and commit:
4487492b92a4f ("x86/tdx: Use pg_level in TDX APIs, not the TDX-Module's 0-based level")
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/include/asm/tdx.h
index 15eac89b0afbe,c140ddde59ffe..0000000000000
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@@ -187,14 -187,6 +187,8 @@@ static inline u64 mk_keyed_paddr(u16 hk
return ret;
}
- static inline int pg_level_to_tdx_sept_level(enum pg_level level)
- {
- WARN_ON_ONCE(level == PG_LEVEL_NONE);
- return level - 1;
- }
-
+void tdx_sys_disable(void);
+
u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args);
u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page);
u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, struct page *page, struct page *source, u64 *ext_err1, u64 *ext_err2);
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-05-18 16:10 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-18 16:10 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-27 14:22 linux-next: manual merge of the kvm-x86 tree with the tip tree Mark Brown
2026-03-04 12:21 Mark Brown
2026-03-04 23:10 ` Sean Christopherson
2026-03-05 19:24 ` Nathan Chancellor
2026-03-06 13:24 ` Mark Brown
2026-03-06 22:48 ` Nathan Chancellor
2025-11-25 4:59 Stephen Rothwell
2025-11-25 7:09 ` Borislav Petkov
2025-12-04 5:10 ` Stephen Rothwell
2025-11-20 4:52 Stephen Rothwell
2025-11-20 4:46 Stephen Rothwell
2025-10-20 0:07 Stephen Rothwell
2025-09-22 9:50 Mark Brown
2025-09-22 11:27 ` Aithal, Srikanth
2025-09-22 11:40 ` Mark Brown
2025-09-22 13:23 ` Mark Brown
2025-09-22 14:04 ` Sean Christopherson
2025-09-30 18:13 ` Paolo Bonzini
2025-09-19 13:50 Mark Brown
2025-01-06 4:05 Stephen Rothwell
2025-01-09 19:18 ` Sean Christopherson
2025-01-23 3:25 ` Stephen Rothwell
2024-02-07 4:35 Stephen Rothwell
2023-01-19 23:54 Stephen Rothwell
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=ags5_LIZq2DlzmAN@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rick.p.edgecombe@intel$(echo .)com \
--cc=seanjc@google$(echo .)com \
--cc=vishal.l.verma@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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