> Causes merge conflicts with my tree when applied with git am (actually > b4 shazam).
Jarkko, this series was sent based on tag next-20260828 after applying prerequisite series[1]. Some minor Makefile/MAINTAINERS conflict was observed IIRC. Kindly note for merge strategy, prerequisite series[1] will be merged via TEE tree and current series need patch 1-5(not patch6) only as prerequisite. To merge TPM series, it's better to pick from your tree and TEE maintainer can ACK patch 1/2 for seamless integration? [1] https://lore.kernel.org/lkml/20260722-qcom_uefisecapp_migrate_qcomtee-v2-0-b8a8fcbe4...@oss.qualcomm.com/ -- Regards Kuldeep
