Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/include/asm/shared/tdx.h
Simple merge

diff --cc arch/x86/include/asm/tdx.h
Simple merge

diff --cc samples/Kconfig
Simple merge

diff --cc samples/Makefile
index 0545e6a0e84d270bd84917ca4a9e21dc873b63c4,c95bac31851c2cafbbbef3ad8e36bea752e411ea..07641e177bd8bb1124bad4ac24fdbbbbde80f2f5
--- 1/samples/Makefile
--- 2/samples/Makefile
+++ b/samples/Makefile
@@@ -42,5 -42,5 +42,6 @@@ obj-$(CONFIG_SAMPLE_FPROBE)           += fprobe
  obj-$(CONFIG_SAMPLES_RUST)            += rust/
  obj-$(CONFIG_SAMPLE_DAMON_WSSE)               += damon/
  obj-$(CONFIG_SAMPLE_DAMON_PRCL)               += damon/
 +obj-$(CONFIG_SAMPLE_DAMON_MTIER)      += damon/
  obj-$(CONFIG_SAMPLE_HUNG_TASK)                += hung_task/
+ obj-$(CONFIG_SAMPLE_TSM_MR)           += tsm-mr/