Re: linux-next: manual merge of the char-misc tree with the tpmdd tree

2017-03-24 Thread Greg KH
On Fri, Mar 24, 2017 at 02:33:02PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/char/tpm/tpm-chip.c > > between commits: > > 67b67480db8b ("tpm: infrastructure for TPM spaces") > b8e3586e8536 ("tpm: expose space

linux-next: manual merge of the char-misc tree with the tpmdd tree

2017-03-23 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/char/tpm/tpm-chip.c between commits: 67b67480db8b ("tpm: infrastructure for TPM spaces") b8e3586e8536 ("tpm: expose spaces via a device link /dev/tpmrm") from the tpmdd tree and commit: 8dbbf5825181 ("tp

Re: linux-next: manual merge of the char-misc tree with the tpmdd tree

2017-03-23 Thread Jarkko Sakkinen
On Wed, Mar 22, 2017 at 01:13:19PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/char/tpm/tpm-chip.c > > between commit: > > d7a97c3e6592 ("tpm: Use the right clean up after cdev_add completes") I don't think this

Re: linux-next: manual merge of the char-misc tree with the tpmdd tree

2017-03-21 Thread Logan Gunthorpe
Thanks Stephen, I've reviewed the merge and it looks correct to me. On 21/03/17 08:13 PM, Stephen Rothwell wrote: > I fixed it up (I hope, 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 y

linux-next: manual merge of the char-misc tree with the tpmdd tree

2017-03-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/char/tpm/tpm-chip.c between commit: d7a97c3e6592 ("tpm: Use the right clean up after cdev_add completes") 5f6b4fbc12c8 ("tpm: infrastructure for TPM spaces") 1b50e13284d7 ("tpm: expose spaces via a device