Alexader's patches had merge conflicts. This patch set sorts them out.
Alexander Steffen (2):
tpm_tis_spi: Use DMA-safe memory for SPI transfers
tpm-dev-common: Reject too short writes
Arnd Bergmann (1):
tpm: constify transmit data pointers
drivers/char/tpm/tpm-dev.c | 6 ++++++
drivers/char/tpm/tpm_tis.c | 2 +-
drivers/char/tpm/tpm_tis_core.c | 4 ++--
drivers/char/tpm/tpm_tis_core.h | 4 ++--
drivers/char/tpm/tpm_tis_spi.c | 48 +++++++++++++++++++++++------------------
5 files changed, 38 insertions(+), 26 deletions(-)
--
2.15.1