Skip to content
  • Linus Torvalds's avatar
    Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 1436ab06
    Linus Torvalds authored
    Pull TPM updates from James Morris:
     "Here are the TPM updates from Jarkko for v4.14, which I've placed in
      their own branch (next-tpm). I ended up cherry-picking them as other
      changes had been made in Jarkko's branch after he sent me his original
      pull request.
    
      I plan on maintaining a separate branch for TPM (and other security
      subsystems) from now on.
    
      From Jarkko: 'Not much this time except a few fixes'"
    
    * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      tpm: ibmvtpm: simplify crq initialization and document crq format
      tpm: replace msleep() with  usleep_range() in TPM 1.2/2.0 generic drivers
      Documentation: tpm: add powered-while-suspended binding documentation
      tpm: tpm_crb: constify acpi_device_id.
      tpm: vtpm: constify vio_device_id
    1436ab06