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

2017-12-08 Thread Jarkko Sakkinen
On Fri, Dec 08, 2017 at 01:25:35PM +1100, Stephen Rothwell wrote: > Hi Jarkko, > > Today's linux-next merge of the tpmdd tree got a conflict in: > > MAINTAINERS > > between commit: > > 60fdb44a23cb ("MAINTAINERS: update TPM driver infrastructure changes") > > from Linus' tree and commit: >

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

2017-12-07 Thread Stephen Rothwell
Hi Jarkko, Today's linux-next merge of the tpmdd tree got a conflict in: MAINTAINERS between commit: 60fdb44a23cb ("MAINTAINERS: update TPM driver infrastructure changes") from Linus' tree and commit: 510230d28445 ("tpm: Update MAINTAINERS for Jason Gunthorpe") from the tpmdd tree. I

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

2017-10-13 Thread Jarkko Sakkinen
On Wed, 2017-10-11 at 16:01 +0100, Mark Brown wrote: > 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") > > f

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

2017-10-11 Thread Mark Brown
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 wa

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

2016-06-20 Thread Jarkko Sakkinen
On Mon, Jun 20, 2016 at 01:13:45PM +1000, Stephen Rothwell wrote: > Hi Jarkko, > > Today's linux-next merge of the tpmdd tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 7aa5d38cfb77 ("of: Add Inforce Computing to vendor prefix list")

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

2016-06-19 Thread Stephen Rothwell
Hi Jarkko, Today's linux-next merge of the tpmdd tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 7aa5d38cfb77 ("of: Add Inforce Computing to vendor prefix list") 3eefa7e8cc85 ("dt-bindings: Add vendor prefix for TechNexion") from Linus' tree