* linux-next: bad rebase of the tpmdd tree
@ 2023-05-30 23:24 Stephen Rothwell
2023-06-05 19:07 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-05-30 23:24 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
Hi all,
The tpmdd tree has been rebased onto Linus' tree, but has included some
of the patches from Linus' tree as new commits :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: bad rebase of the tpmdd tree
2023-05-30 23:24 linux-next: bad rebase of the tpmdd tree Stephen Rothwell
@ 2023-06-05 19:07 ` Jarkko Sakkinen
2023-06-05 19:08 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: Jarkko Sakkinen @ 2023-06-05 19:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: bad rebase of the tpmdd tree
2023-06-05 19:07 ` Jarkko Sakkinen
@ 2023-06-05 19:08 ` Jarkko Sakkinen
0 siblings, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2023-06-05 19:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Mon, 2023-06-05 at 22:07 +0300, Jarkko Sakkinen wrote:
> 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
[except 1f603c8055ab dropped from above]
BR, Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-05 19:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-30 23:24 linux-next: bad rebase of the tpmdd tree Stephen Rothwell
2023-06-05 19:07 ` Jarkko Sakkinen
2023-06-05 19:08 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox