* linux-next: duplicate patch in the tpmdd tree
@ 2024-05-06 4:59 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-05-06 4:59 UTC (permalink / raw)
To: Jarkko Sakkinen, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
Hi all,
The following commit is also in the mm-hotfixes tree as a different commit
(but the same patch):
71dd2201bdef ("MAINTAINERS: Update URL's for KEYS/KEYRINGS_INTEGRITY and TPM DEVICE DRIVER")
This is commit
ecb42b703f3d ("MAINTAINERS: update URL's for KEYS/KEYRINGS_INTEGRITY and TPM DEVICE DRIVER")
in the mm-hotifxes-unstable branch of the mm-hotfixes tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: duplicate patch in the tpmdd tree
@ 2024-05-28 22:19 Stephen Rothwell
2024-05-28 22:41 ` Jarkko Sakkinen
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2024-05-28 22:19 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: duplicate patch in the tpmdd tree
2024-05-28 22:19 linux-next: duplicate patch in the tpmdd tree Stephen Rothwell
@ 2024-05-28 22:41 ` Jarkko Sakkinen
0 siblings, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2024-05-28 22:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-28 22:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-28 22:19 linux-next: duplicate patch in the tpmdd tree Stephen Rothwell
2024-05-28 22:41 ` Jarkko Sakkinen
-- strict thread matches above, loose matches on Subject: below --
2024-05-06 4:59 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).