From: Jarkko Sakkinen <jarkko@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: bad rebase of the tpmdd tree
Date: Mon, 05 Jun 2023 22:07:50 +0300 [thread overview]
Message-ID: <e050f28406061440edcd96921effff7fe01532f0.camel@kernel.org> (raw)
In-Reply-To: <20230531092448.5fa4d718@canb.auug.org.au>
On Wed, 2023-05-31 at 09:24 +1000, Stephen Rothwell wrote:
> Hi all,
>
> The tpmdd tree has been rebased onto Linus' tree, but has included some
> of the patches from Linus' tree as new commits :-(
Hi, I'm sorry for late response.
I fixed the issue:
git log --oneline upstream/master..origin/next
57094c1699ab (HEAD -> next, origin/next) integrity: Remove EXPERIMENTAL from Kconfig
14d723483fb7 integrity: Enforce digitalSignature usage in the ima and evm keyrings
538b04b8c136 KEYS: DigitalSignature link restriction
90bfba7a9e1d KEYS: Replace all non-returning strlcpy with strscpy
405def5af246 security: keys: perform capable check only on privileged operations
f28ac094fb2d tpm_tis_spi: Release chip select when flow control fails
9c7b610c7299 tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11
1f603c8055ab tpm: tpm_vtpm_proxy: fix a race condition in /dev/vtpmx creation
BR, Jarkko
next prev parent reply other threads:[~2023-06-05 19:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-30 23:24 linux-next: bad rebase of the tpmdd tree Stephen Rothwell
2023-06-05 19:07 ` Jarkko Sakkinen [this message]
2023-06-05 19:08 ` Jarkko Sakkinen
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=e050f28406061440edcd96921effff7fe01532f0.camel@kernel.org \
--to=jarkko@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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