Merge tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Sep 2019 16:40:24 +0000 (09:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Sep 2019 16:40:24 +0000 (09:40 -0700)
Pull tpm fixes from Jarkko Sakkinen.

* tag 'tpmdd-next-20190925' of git://git.infradead.org/users/jjs/linux-tpmdd:
  tpm: Wrap the buffer from the caller to tpm_buf in tpm_send()
  MAINTAINERS: keys: Update path to trusted.h
  KEYS: trusted: correctly initialize digests and fix locking issue
  selftests/tpm2: Add log and *.pyc to .gitignore
  selftests/tpm2: Add the missing TEST_FILES assignment

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index a8d193a74692e7f91b1c0345704748f649961120,ec807d4468544e5a75cd996ad78f93a2269beff1..a97f1be63b9d18be9fa5ef9685ec2a0a5a787b61
@@@ -7865,12 -7865,6 +7865,12 @@@ S:    Maintaine
  F:    drivers/mfd/lpc_ich.c
  F:    drivers/gpio/gpio-ich.c
  
 +ICY I2C DRIVER
 +M:    Max Staudt <max@enpas.org>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-icy.c
 +
  IDE SUBSYSTEM
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
@@@ -9056,7 -9050,7 +9056,7 @@@ S:      Supporte
  F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
- F:    security/keys/trusted.h
+ F:    include/keys/trusted.h
  
  KEYS/KEYRINGS:
  M:    David Howells <dhowells@redhat.com>
@@@ -13797,7 -13791,7 +13797,7 @@@ F:   drivers/clk/renesas
  RENESAS EMEV2 I2C DRIVER
  M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/i2c-emev2.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,iic-emev2.txt
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET DRIVERS
@@@ -13819,15 -13813,15 +13819,15 @@@ F:        drivers/iio/adc/rcar-gyroadc.
  RENESAS R-CAR I2C DRIVERS
  M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/i2c-rcar.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,i2c.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,iic.txt
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
  RENESAS RIIC DRIVER
  M:    Chris Brandt <chris.brandt@renesas.com>
  S:    Supported
 -F:    Documentation/devicetree/bindings/i2c/i2c-riic.txt
 +F:    Documentation/devicetree/bindings/i2c/renesas,riic.txt
  F:    drivers/i2c/busses/i2c-riic.c
  
  RENESAS USB PHY DRIVER