mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: James Morris <jmorris@namei.org>
Cc: linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [GIT PULL] tpmdd reverts for Linux 4.9
Date: Tue, 27 Sep 2016 12:10:54 +0300	[thread overview]
Message-ID: <20160927091054.GA17915@intel.com> (raw)

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(-)

             reply	other threads:[~2016-09-27  9:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-27  9:10 Jarkko Sakkinen [this message]
2016-09-27  9:24 ` James Morris

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=20160927091054.GA17915@intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=jmorris@namei.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®