From: Jarkko Sakkinen <jarkko@kernel.org>
To: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
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: Fri, 25 Sep 2026 17:46:02 +0300 [thread overview]
Message-ID: <araJKqHdeXstD7nR@kernel.org> (raw)
In-Reply-To: <d555ee76-3999-4ed0-be6a-ca07354af6d4@oss.qualcomm.com>
On Mon, Sep 21, 2026 at 02:06:43PM +0530, Kuldeep Singh wrote:
> > 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?
So I'm just having trouble following so: what is the best option
for you? What do you want me to do? Which route you prefer?
>
> [1]
> https://lore.kernel.org/lkml/20260722-qcom_uefisecapp_migrate_qcomtee-v2-0-b8a8fcbe4211@oss.qualcomm.com/
>
> --
> Regards
> Kuldeep
>
Br, Jarkko
WARNING: multiple messages have this Message-ID (diff)
From: Jarkko Sakkinen via OP-TEE <op-tee@lists.trustedfirmware.org>
To: Kuldeep Singh <kuldeep.singh@oss.qualcomm.com>
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: Fri, 25 Sep 2026 17:46:02 +0300 [thread overview]
Message-ID: <araJKqHdeXstD7nR@kernel.org> (raw)
In-Reply-To: <d555ee76-3999-4ed0-be6a-ca07354af6d4@oss.qualcomm.com>
On Mon, Sep 21, 2026 at 02:06:43PM +0530, Kuldeep Singh wrote:
> > 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?
So I'm just having trouble following so: what is the best option
for you? What do you want me to do? Which route you prefer?
>
> [1]
> https://lore.kernel.org/lkml/20260722-qcom_uefisecapp_migrate_qcomtee-v2-0-b8a8fcbe4211@oss.qualcomm.com/
>
> --
> Regards
> Kuldeep
>
Br, Jarkko
next prev parent reply other threads:[~2026-09-25 14:46 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-07 9:28 [PATCH v2 0/3] Add TPM support via Qualcomm TEE TPM TA Kuldeep Singh
2026-09-07 9:28 ` Kuldeep Singh via OP-TEE
2026-09-07 9:28 ` [PATCH v2 1/3] tee: qcomtee: Register qcom.tz.tpm service for discovery Kuldeep Singh
2026-09-07 9:28 ` Kuldeep Singh via OP-TEE
2026-09-18 1:46 ` Jarkko Sakkinen
2026-09-18 1:46 ` Jarkko Sakkinen via OP-TEE
2026-09-21 8:10 ` Kuldeep Singh
2026-09-21 8:10 ` Kuldeep Singh via OP-TEE
2026-09-25 8:51 ` Jens Wiklander
2026-09-25 8:51 ` Jens Wiklander via OP-TEE
2026-09-28 8:58 ` Amirreza Zarrabi
2026-09-28 8:58 ` Amirreza Zarrabi via OP-TEE
2026-09-07 9:28 ` [PATCH v2 2/3] tpm: Introduce Qualcomm TPM driver Kuldeep Singh
2026-09-07 9:28 ` Kuldeep Singh via OP-TEE
2026-09-18 1:48 ` Jarkko Sakkinen
2026-09-18 1:48 ` Jarkko Sakkinen via OP-TEE
2026-09-28 23:29 ` Amirreza Zarrabi
2026-09-28 23:29 ` Amirreza Zarrabi via OP-TEE
2026-10-07 9:20 ` Kuldeep Singh
2026-10-07 9:20 ` Kuldeep Singh via OP-TEE
2026-09-07 9:28 ` [PATCH v2 3/3] MAINTAINERS: Add Qualcomm TPM driver entry Kuldeep Singh
2026-09-07 9:28 ` Kuldeep Singh via OP-TEE
2026-09-18 1:49 ` Jarkko Sakkinen
2026-09-18 1:49 ` Jarkko Sakkinen via OP-TEE
2026-09-16 9:02 ` [PATCH v2 0/3] Add TPM support via Qualcomm TEE TPM TA Kuldeep Singh
2026-09-16 9:02 ` Kuldeep Singh via OP-TEE
2026-09-18 1:53 ` Jarkko Sakkinen
2026-09-18 1:53 ` Jarkko Sakkinen via OP-TEE
2026-09-21 8:36 ` Kuldeep Singh
2026-09-21 8:36 ` Kuldeep Singh via OP-TEE
2026-09-25 14:46 ` Jarkko Sakkinen [this message]
2026-09-25 14:46 ` Jarkko Sakkinen via OP-TEE
2026-09-28 9:34 ` Kuldeep Singh
2026-09-28 9:34 ` Kuldeep Singh via OP-TEE
-- strict thread matches above, loose matches on Subject: below --
2026-10-01 5:50 zeroknots
2026-10-01 5:50 ` zeroknots via OP-TEE
2026-10-05 6:57 ` Kuldeep Singh
2026-10-05 6:57 ` Kuldeep Singh via OP-TEE
2026-10-05 7:24 ` Dmitry Baryshkov
2026-10-05 7:24 ` Dmitry Baryshkov via OP-TEE
2026-10-05 12:00 ` Kuldeep Singh
2026-10-05 12:00 ` Kuldeep Singh via OP-TEE
2026-10-07 13:40 ` Xilin Wu
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=araJKqHdeXstD7nR@kernel.org \
--to=jarkko@kernel.org \
--cc=amirreza.zarrabi@oss.qualcomm.com \
--cc=jenswi@kernel.org \
--cc=jgg@ziepe.ca \
--cc=kuldeep.singh@oss.qualcomm.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.