From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Apr 2019 03:06:43 +0000 (-1000)
Subject: Merge branch 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.4-rc1~1257
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a556810d8e06aa2da8bbe22da3d105eb5a0d0c7d;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'fixes-v5.1' of git://git./linux/kernel/git/jmorris/linux-security

Pull TPM fixes from James Morris:
 "From Jarkko: These are critical fixes for v5.1. Contains also couple
  of new selftests for v5.1 features (partial reads in /dev/tpm0)"

* 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selftests/tpm2: Open tpm dev in unbuffered mode
  selftests/tpm2: Extend tests to cover partial reads
  KEYS: trusted: fix -Wvarags warning
  tpm: Fix the type of the return value in calc_tpm2_event_size()
  KEYS: trusted: allow trusted.ko to initialize w/o a TPM
  tpm: fix an invalid condition in tpm_common_poll
  tpm: turn on TPM on suspend for TPM 1.x
---

a556810d8e06aa2da8bbe22da3d105eb5a0d0c7d