linux-next: manual merge of the kselftest tree with the tpmdd tree

linux-next: manual merge of the kselftest tree with the tpmdd tree

[Mark Brown]

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

Hi all,

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

  tools/testing/selftests/tpm2/Makefile

between commit:

  3fb2179b0f3553a ("selftests/tpm2: Add the missing TEST_FILES assignment")

from the tpmdd tree and commit:

  d04e26067d13f01 ("selftests: tpm2: install python files")

from the kselftest 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 tools/testing/selftests/tpm2/Makefile
index bf401f725eef8,1a5db1eb8ed51..0000000000000
--- a/tools/testing/selftests/tpm2/Makefile
+++ b/tools/testing/selftests/tpm2/Makefile
@@@ -2,4 -2,4 +2,5 @@@
  include ../lib.mk
  
  TEST_PROGS := test_smoke.sh test_space.sh
 +TEST_FILES := tpm2.py tpm2_tests.py
+ TEST_PROGS_EXTENDED := tpm2.py tpm2_tests.py

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

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

[Anders Roxell]

On Mon, 16 Sep 2019 at 03:45, Mark Brown <broonie@kernel.org> wrote:
>
> Hi all,

Hi,

>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
>   tools/testing/selftests/tpm2/Makefile
>
> between commit:
>
>   3fb2179b0f3553a ("selftests/tpm2: Add the missing TEST_FILES assignment")
>
> from the tpmdd tree and commit:
>
>   d04e26067d13f01 ("selftests: tpm2: install python files")
>
> from the kselftest tree.

If I re-read the Documentation/dev-tools/kselftest.rst
I think the patch from the kselftest tree should be dropped.

I saw that I didn't send an email to the tpm maintainers or the tpm
list when I sent the
patch, I'm sorry.


Cheers,
Anders

>
> 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 tools/testing/selftests/tpm2/Makefile
> index bf401f725eef8,1a5db1eb8ed51..0000000000000
> --- a/tools/testing/selftests/tpm2/Makefile
> +++ b/tools/testing/selftests/tpm2/Makefile
> @@@ -2,4 -2,4 +2,5 @@@
>   include ../lib.mk
>
>   TEST_PROGS := test_smoke.sh test_space.sh
>  +TEST_FILES := tpm2.py tpm2_tests.py
> + TEST_PROGS_EXTENDED := tpm2.py tpm2_tests.py

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

[Mark Brown]

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

On Mon, Sep 16, 2019 at 03:16:54PM +0200, Anders Roxell wrote:

> If I re-read the Documentation/dev-tools/kselftest.rst
> I think the patch from the kselftest tree should be dropped.

> I saw that I didn't send an email to the tpm maintainers or the tpm
> list when I sent the
> patch, I'm sorry.

If the change is fine that might be more trouble than it's worth, it's a
trivial add/add conflict.  Up to those concerned though.

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

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

[shuah]

On 9/16/19 7:42 AM, Mark Brown wrote:
> On Mon, Sep 16, 2019 at 03:16:54PM +0200, Anders Roxell wrote:
> 
>> If I re-read the Documentation/dev-tools/kselftest.rst
>> I think the patch from the kselftest tree should be dropped.
> 
>> I saw that I didn't send an email to the tpm maintainers or the tpm
>> list when I sent the
>> patch, I'm sorry.
> 
> If the change is fine that might be more trouble than it's worth, it's a
> trivial add/add conflict.  Up to those concerned though.
> 


I usually handle these with sending a note to Linus in my pull request
and request him to pick the one from next. Dropping patch doesn't work
very well.

No worries I will handle this in my pull request.

thanks,
-- Shuah

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

[Jarkko Sakkinen]

On Mon, Sep 16, 2019 at 02:42:03PM +0100, Mark Brown wrote:
> On Mon, Sep 16, 2019 at 03:16:54PM +0200, Anders Roxell wrote:
> 
> > If I re-read the Documentation/dev-tools/kselftest.rst
> > I think the patch from the kselftest tree should be dropped.
> 
> > I saw that I didn't send an email to the tpm maintainers or the tpm
> > list when I sent the
> > patch, I'm sorry.
> 
> If the change is fine that might be more trouble than it's worth, it's a
> trivial add/add conflict.  Up to those concerned though.

Do you want me to take the patch off from the next and rebase my
tree later on or?

/Jarkko