2024-05-28 22:19:58

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: duplicate patch in the tpmdd tree

Hi all,

The following commit is also in Linus Torvalds' tree as a different
commit (but the same patch):

7df9ef4f7b1e ("tpm_tis_spi: Account for SPI header when allocating TPM SPI xfer buffer")

--
Cheers,
Stephen Rothwell

Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-05-28 22:41:14

by Jarkko Sakkinen

[permalink] [raw]
Subject: Re: linux-next: duplicate patch in the tpmdd tree

On Wed May 29, 2024 at 1:19 AM EEST, Stephen Rothwell wrote:
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different
> commit (but the same patch):
>
> 7df9ef4f7b1e ("tpm_tis_spi: Account for SPI header when allocating TPM SPI xfer buffer")

Sorry it was my fault forgot to update 'next'.

Now it should be fixed.

I verified this also by rebasing Linus' tree, which went cleanly
and git push origin next did not require '-f', so hopefully now
all is good...

BR, Jarkko