From: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
To: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Amirreza Zarrabi <amirreza.zarrabi@oss.qualcomm.com>,
Jens Wiklander <jenswi@kernel.org>,
Sumit Garg <sumit.garg@kernel.org>,
Peter Huewe <peterhuewe@gmx.de>, Jason Gunthorpe <jgg@ziepe.ca>,
linux-arm-msm@vger.kernel.org, op-tee@lists.trustedfirmware.org,
linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org
Subject: Re: [PATCH v2 0/3] Add TPM support via Qualcomm TEE TPM TA
Date: Mon, 21 Sep 2026 14:06:43 +0530 [thread overview]
Message-ID: <d555ee76-3999-4ed0-be6a-ca07354af6d4@oss.qualcomm.com> (raw)
In-Reply-To: <aqyZtHynb2nuQT-P@kernel.org>
> 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-b8a8fcbe4211@oss.qualcomm.com/
--
Regards
Kuldeep
prev parent reply other threads:[~2026-09-21 8:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-07 9:28 Kuldeep Singh
2026-09-07 9:28 ` [PATCH v2 1/3] tee: qcomtee: Register qcom.tz.tpm service for discovery Kuldeep Singh
2026-09-18 1:46 ` Jarkko Sakkinen
2026-09-21 8:10 ` Kuldeep Singh
2026-09-07 9:28 ` [PATCH v2 2/3] tpm: Introduce Qualcomm TPM driver Kuldeep Singh
2026-09-18 1:48 ` Jarkko Sakkinen
2026-09-07 9:28 ` [PATCH v2 3/3] MAINTAINERS: Add Qualcomm TPM driver entry Kuldeep Singh
2026-09-18 1:49 ` Jarkko Sakkinen
2026-09-16 9:02 ` [PATCH v2 0/3] Add TPM support via Qualcomm TEE TPM TA Kuldeep Singh
2026-09-18 1:53 ` Jarkko Sakkinen
2026-09-21 8:36 ` Kuldeep Singh [this message]
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=d555ee76-3999-4ed0-be6a-ca07354af6d4@oss.qualcomm.com \
--to=kuldeep.singh@oss.qualcomm.com \
--cc=amirreza.zarrabi@oss.qualcomm.com \
--cc=jarkko@kernel.org \
--cc=jenswi@kernel.org \
--cc=jgg@ziepe.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=peterhuewe@gmx.de \
--cc=sumit.garg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®