From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dan Williams <dan.j.williams@intel•com>,
<sathyanarayanan.kuppuswamy@linux•intel.com>,
<yilun.xu@intel•com>, <sameo@rivosinc•com>, <aik@amd•com>,
<suzuki.poulose@arm•com>, <steven.price@arm•com>,
<lukas@wunner•de>, Sean Christopherson <seanjc@google•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tom Lendacky <thomas.lendacky@amd•com>
Subject: linux-next: manual merge of the devsec-tsm tree with the kvm-x86 tree
Date: Mon, 1 Dec 2025 12:50:39 +1100 [thread overview]
Message-ID: <20251201125039.36b9f37d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
Hi all,
Today's linux-next merge of the devsec-tsm tree got a conflict in:
include/linux/psp-sev.h
between commit:
c9434e64e8b4 ("crypto: ccp - Add an API to return the supported SEV-SNP policy bits")
from the kvm-x86 tree and commit:
d65a2856e8b2 ("crypto: ccp: Enable SEV-TIO feature in the PSP when supported")
from the devsec-tsm 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.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/psp-sev.h
index abcdee256c65,cce864dbf281..000000000000
--- a/include/linux/psp-sev.h
+++ b/include/linux/psp-sev.h
@@@ -882,10 -857,8 +890,11 @@@ struct snp_feature_info
u32 edx;
} __packed;
-#define SNP_CIPHER_TEXT_HIDING_SUPPORTED BIT(3)
+ #define SNP_SEV_TIO_SUPPORTED BIT(1) /* EBX */
+#define SNP_RAPL_DISABLE_SUPPORTED BIT(2)
+#define SNP_CIPHER_TEXT_HIDING_SUPPORTED BIT(3)
+#define SNP_AES_256_XTS_POLICY_SUPPORTED BIT(4)
+#define SNP_CXL_ALLOW_POLICY_SUPPORTED BIT(5)
#ifdef CONFIG_CRYPTO_DEV_SP_PSP
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2025-12-01 1:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251201125039.36b9f37d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aik@amd$(echo .)com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas@wunner$(echo .)de \
--cc=sameo@rivosinc$(echo .)com \
--cc=sathyanarayanan.kuppuswamy@linux$(echo .)intel.com \
--cc=seanjc@google$(echo .)com \
--cc=steven.price@arm$(echo .)com \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=thomas.lendacky@amd$(echo .)com \
--cc=yilun.xu@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