linux-next: manual merge of the tpmdd tree with Linus' tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]

Hi Jarkko,

Today's linux-next merge of the tpmdd tree got a conflict in:

  drivers/char/tpm/tpm2-cmd.c

between commit:

   9f3fc7bcddcb51 ("tpm: replace msleep() with  usleep_range() in TPM 1.2/2.0 generic drivers")

from Linus' tree and commit:

   217d4dfa87415e ("tpm: Use dynamic delay to wait for TPM 2.0 self test result")

from the tpmdd tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/char/tpm/tpm2-cmd.c
index e1a41b788f08,f40d20671a78..000000000000
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@@ -900,6 -867,10 +867,11 @@@ static int tpm2_do_selftest(struct tpm_
  			break;
  
  		tpm_msleep(delay_msec);
++
+ 		duration -= delay_msec;
+ 
+ 		/* wait longer the next round */
+ 		delay_msec *= 2;
  	}
  
  	return rc;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]