* [GIT PULL] tpmdd reverts for Linux 4.9
@ 2016-09-27 9:10 Jarkko Sakkinen
2016-09-27 9:24 ` James Morris
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Sakkinen @ 2016-09-27 9:10 UTC (permalink / raw)
To: James Morris; +Cc: linux-security-module, linux-kernel
Hi James,
I had a typo in my PR command:
git request-pull security/next git://git.infradead.org/users/jjs/linux-tpmdd.git master > tpmdd-next-20160915.txt
^^^^^^
That should have been the signed tag tpmdd-next-20160915. This caused
four commits slip into your tree that are not meant for 4.9 release. I
created a script to generate the signed tag + PR as a corrective
measure.
/Jarkko
The following changes since commit 8a17ef9d8543744a0c6a6f5fdc65b5770e7eaa64:
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next (2016-09-21 11:54:19 +1000)
are available in the git repository at:
git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20160927
for you to fetch changes up to 324152502b0ef2f65a3fe039b7dcd27b223d14ac:
Revert "tpm/tpm_crb: implement tpm crb idle state" (2016-09-27 12:02:13 +0300)
----------------------------------------------------------------
tpmdd reverts for Linux 4.9
----------------------------------------------------------------
Jarkko Sakkinen (4):
Revert "tmp/tpm_crb: implement runtime pm for tpm_crb"
Revert "tpm/tpm_crb: open code the crb_init into acpi_add"
Revert "tmp/tpm_crb: fix Intel PTT hw bug during idle state"
Revert "tpm/tpm_crb: implement tpm crb idle state"
drivers/char/tpm/tpm-interface.c | 5 --
drivers/char/tpm/tpm_crb.c | 173 ++++++---------------------------------
2 files changed, 24 insertions(+), 154 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [GIT PULL] tpmdd reverts for Linux 4.9
2016-09-27 9:10 [GIT PULL] tpmdd reverts for Linux 4.9 Jarkko Sakkinen
@ 2016-09-27 9:24 ` James Morris
0 siblings, 0 replies; 2+ messages in thread
From: James Morris @ 2016-09-27 9:24 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: linux-security-module, linux-kernel
On Tue, 27 Sep 2016, Jarkko Sakkinen wrote:
> Hi James,
>
> I had a typo in my PR command:
>
> git request-pull security/next git://git.infradead.org/users/jjs/linux-tpmdd.git master > tpmdd-next-20160915.txt
> ^^^^^^
> That should have been the signed tag tpmdd-next-20160915. This caused
> four commits slip into your tree that are not meant for 4.9 release. I
> created a script to generate the signed tag + PR as a corrective
> measure.
>
> /Jarkko
>
> The following changes since commit 8a17ef9d8543744a0c6a6f5fdc65b5770e7eaa64:
>
> Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next (2016-09-21 11:54:19 +1000)
>
> are available in the git repository at:
>
> git://git.infradead.org/users/jjs/linux-tpmdd.git tags/tpmdd-next-20160927
>
Pulled, thanks.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-27 9:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-27 9:10 [GIT PULL] tpmdd reverts for Linux 4.9 Jarkko Sakkinen
2016-09-27 9:24 ` James Morris
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.