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

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

[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 and commits:

  45a33961f81a ("devicetree: Add infineon to vendor-prefix.txt")
  3a34e75f6a91 ("devicetree: Add Trusted Computing Group to vendor-prefix.txt")

from the tpmdd tree.

BTW: commit 3a34e75f6a91 added the new entry out of alphabetical order.

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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index d2bce2239769,717bae92e28a..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -125,10 -111,9 +125,11 @@@ hp	Hewlett Packar
  i2se	I2SE GmbH
  ibm	International Business Machines (IBM)
  idt	Integrated Device Technologies, Inc.
 +ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)
  iom	Iomega Corporation
  img	Imagination Technologies Ltd.
+ infineon Infineon Technologies
 +inforce	Inforce Computing
  ingenic	Ingenic Semiconductor
  innolux	Innolux Corporation
  intel	Intel Corporation
@@@ -251,12 -227,10 +252,13 @@@ st	STMicroelectronic
  startek	Startek
  ste	ST-Ericsson
  stericsson	ST-Ericsson
 +syna	Synaptics Inc.
  synology	Synology, Inc.
 +SUNW	Sun Microsystems, Inc
  tbs	TBS Technologies
 -tcl	Toby Churchill Ltd.
+ tcg	Trusted Computing Group
 +tcl	Toby Churchill Ltd.
 +technexion	TechNexion
  technologic	Technologic Systems
  thine	THine Electronics, Inc.
  ti	Texas Instruments

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

[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")
>   3eefa7e8cc85 ("dt-bindings: Add vendor prefix for TechNexion")
> 
> from Linus' tree and commits:
> 
>   45a33961f81a ("devicetree: Add infineon to vendor-prefix.txt")
>   3a34e75f6a91 ("devicetree: Add Trusted Computing Group to vendor-prefix.txt")
> 
> from the tpmdd tree.
> 
> BTW: commit 3a34e75f6a91 added the new entry out of alphabetical order.
> 
> 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.

Got you, thanks.

> -- 
> Cheers,
> Stephen Rothwell

/Jarkko

> 
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
> index d2bce2239769,717bae92e28a..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -125,10 -111,9 +125,11 @@@ hp	Hewlett Packar
>   i2se	I2SE GmbH
>   ibm	International Business Machines (IBM)
>   idt	Integrated Device Technologies, Inc.
>  +ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)
>   iom	Iomega Corporation
>   img	Imagination Technologies Ltd.
> + infineon Infineon Technologies
>  +inforce	Inforce Computing
>   ingenic	Ingenic Semiconductor
>   innolux	Innolux Corporation
>   intel	Intel Corporation
> @@@ -251,12 -227,10 +252,13 @@@ st	STMicroelectronic
>   startek	Startek
>   ste	ST-Ericsson
>   stericsson	ST-Ericsson
>  +syna	Synaptics Inc.
>   synology	Synology, Inc.
>  +SUNW	Sun Microsystems, Inc
>   tbs	TBS Technologies
>  -tcl	Toby Churchill Ltd.
> + tcg	Trusted Computing Group
>  +tcl	Toby Churchill Ltd.
>  +technexion	TechNexion
>   technologic	Technologic Systems
>   thine	THine Electronics, Inc.
>   ti	Texas Instruments

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

[Mark Brown]

[-- 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 --]

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

[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")
> 
> 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;

I guess this is related to that I missed the email from James to LSM that
the branch that I should follow was updated. Apologies.

/Jarkko

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

[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 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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 9fa8f576f5cf,3e099b360db3..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13830,10 -13581,12 +13830,10 @@@ F:	drivers/platform/x86/toshiba-wmi.
  
  TPM DEVICE DRIVER
  M:	Peter Huewe <peterhuewe@gmx.de>
 -M:	Marcel Selhorst <tpmdd@selhorst.net>
  M:	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
- R:	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
+ R:	Jason Gunthorpe <jgg@ziepe.ca>
 -W:	http://tpmdd.sourceforge.net
 -L:	tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 -Q:	https://patchwork.kernel.org/project/tpmdd-devel/list/
 +L:	linux-integrity@vger.kernel.org
 +Q:	https://patchwork.kernel.org/project/linux-integrity/list/
  T:	git git://git.infradead.org/users/jjs/linux-tpmdd.git
  S:	Maintained
  F:	drivers/char/tpm/

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

[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:
> 
>   510230d28445 ("tpm: Update MAINTAINERS for Jason Gunthorpe")
> 
> 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.
> 
> -- 
> Cheers,
> Stephen Rothwell

Sorry, I'll remove this commit up until security tree is updated to
4.5-rcX.

/Jarkko

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

[Stephen Rothwell]

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

Hi all,

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

  security/keys/trusted-keys/trusted_tpm2.c

between commit:

  9d5171eab462 ("KEYS: trusted: Fix TPM reservation for seal/unseal")

from Linus' tree and commit:

  f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc security/keys/trusted-keys/trusted_tpm2.c
index c87c4df8703d,d225ad140960..000000000000
--- a/security/keys/trusted-keys/trusted_tpm2.c
+++ b/security/keys/trusted-keys/trusted_tpm2.c
@@@ -79,7 -245,10 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip *
  	if (i == ARRAY_SIZE(tpm2_hash_map))
  		return -EINVAL;
  
+ 	if (!options->keyhandle)
+ 		return -EINVAL;
+ 
 -	rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
 +	rc = tpm_try_get_ops(chip);
  	if (rc)
  		return rc;
  

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

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

[James Bottomley]

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

On Fri, 2021-04-23 at 12:39 +1000, Stephen Rothwell wrote:
> diff --cc security/keys/trusted-keys/trusted_tpm2.c
> index c87c4df8703d,d225ad140960..000000000000
> --- a/security/keys/trusted-keys/trusted_tpm2.c
> +++ b/security/keys/trusted-keys/trusted_tpm2.c
> @@@ -79,7 -245,10 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip *
>         if (i == ARRAY_SIZE(tpm2_hash_map))
>                 return -EINVAL;
>   
> +       if (!options->keyhandle)
> +               return -EINVAL;
> + 
>  -      rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
>  +      rc = tpm_try_get_ops(chip);
>         if (rc)
>                 return rc;

Yes, that's the right fix, but it should be the one at the top of my
tpmdd-for-next branch.

Thanks,

James


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

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

[Stephen Rothwell]

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

Hi James,

On Thu, 22 Apr 2021 22:16:29 -0700 James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>
> On Fri, 2021-04-23 at 12:39 +1000, Stephen Rothwell wrote:
> > diff --cc security/keys/trusted-keys/trusted_tpm2.c
> > index c87c4df8703d,d225ad140960..000000000000
> > --- a/security/keys/trusted-keys/trusted_tpm2.c
> > +++ b/security/keys/trusted-keys/trusted_tpm2.c
> > @@@ -79,7 -245,10 +245,10 @@@ int tpm2_seal_trusted(struct tpm_chip *
> >         if (i == ARRAY_SIZE(tpm2_hash_map))
> >                 return -EINVAL;
> >   
> > +       if (!options->keyhandle)
> > +               return -EINVAL;
> > + 
> >  -      rc = tpm_buf_init(&buf, TPM2_ST_SESSIONS, TPM2_CC_CREATE);
> >  +      rc = tpm_try_get_ops(chip);
> >         if (rc)
> >                 return rc;  
> 
> Yes, that's the right fix, but it should be the one at the top of my
> tpmdd-for-next branch.

Yeah, I haven't merged that yet.

-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

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

  Makefile

between commits:

  7877cb91f108 ("Linux 6.4-rc4")
  9561de3a55be ("Linux 6.4-rc5")

from Linus' tree and commit:

  b2b20594528e ("Linux 6.4-rc4")

from the tpmdd tree.

This is caused by the bad rebase and duplicate commits I reported
last week.  Please fix that up.

I fixed it up (I just used the former) 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.

-- 
Cheers,
Stephen Rothwell

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