Subject: linux-next: manual merge of the devsec-tsm tree with the kvm-x86 tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Dec 2025 12:50:39 +1100

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