Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 16 Sep 2019 02:45:39 +0100
From:   Mark Brown <broonie@kernel.org>
To:     Shuah Khan <shuah@kernel.org>,
        Anders Roxell <anders.roxell@linaro.org>,
        Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
        Petr Vorel <pvorel@suse.cz>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the kselftest tree with the tpmdd tree
Message-ID: <20190916014535.GU4352@sirena.co.uk>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="A+KtNVtgI4x4SWvL"
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--A+KtNVtgI4x4SWvL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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

=66rom the tpmdd tree and commit:

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

=66rom 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
 =20
  TEST_PROGS :=3D test_smoke.sh test_space.sh
 +TEST_FILES :=3D tpm2.py tpm2_tests.py
+ TEST_PROGS_EXTENDED :=3D tpm2.py tpm2_tests.py

--A+KtNVtgI4x4SWvL
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl1+6T4ACgkQJNaLcl1U
h9DrGgf9Fx4x4EFYxQf1Wd8MS1pgKI7l4p9OrLGVc25pEEPxhsmSjiCNIwjODgZ/
B03mH96tCv12FnPLsfD+YxC8reCK1LrdpeFrdOAH32+EtjsI43XeMM/So+k6u3Rl
hdikAPQmEo/IZzIL/bkAk7tkQmnrTzzDNtX0UQ2Lv+2k0kvlxtoJmAyZTj54Yuc9
ZDMbM9gWg4myaZBQBHSZk9a/w7JGYtN5k5RyG7nDFieH1OCBiQ3oRLdVdFaXFmgH
rGpVk3hyy8u+AI5Vvfn2tnsEaKoLkXKDpvHCTbNPZS4Bh/PeNf8/moXzpxTf7bVE
oaGaD2UNMMlbGB8vQtKg+TCFwK+6Jw==
=vsVz
-----END PGP SIGNATURE-----

--A+KtNVtgI4x4SWvL--