From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2018 20:25:18 +0000 (-0700)
Subject: Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=52ff0779d6cfcce24c0204c22b0b4899dc55449d;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'next-tpm' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM updates from James Morris:
 "From Jarkko: The only new feature is non-blocking operation for
  /dev/tpm0"

* 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  tpm: Restore functionality to xen vtpm driver.
  tpm: add support for nonblocking operation
  tpm: add ptr to the tpm_space struct to file_priv
  tpm: Make SECURITYFS a weak dependency
  tpm: suppress transmit cmd error logs when TPM 1.2 is disabled/deactivated
  tpm: fix response size validation in tpm_get_random()
---

52ff0779d6cfcce24c0204c22b0b4899dc55449d