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

From: Mark Brown <[email-masked]>
Date: Mon, 16 Sep 2019 02:45:39 +0100

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