"tpm: add retry logic" caused merge conflicts so I picked couple of other fixes in order to get it apply cleanly. James Bottomley (1): tpm: add retry logic Tomas Winkler (1): tpm: cmd_ready command can be issued only after granting locality Winkler, Tomas (1): tpm: tpm-interface: fix tpm_transmit/_cmd kdoc drivers/char/tpm/tpm-interface.c | 131 ++++++++++++++++++++++++------- drivers/char/tpm/tpm.h | 1 + drivers/char/tpm/tpm_crb.c | 108 +++++++++++++++++-------- drivers/char/tpm/tpm_tis_core.c | 4 +- include/linux/tpm.h | 2 +- 5 files changed, 183 insertions(+), 63 deletions(-) -- 2.17.0