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
Date: Mon, 16 Sep 2019 02:45:39 +0100 [thread overview]
Message-ID: <20190916014535.GU4352@sirena.co.uk> (raw)
[-- 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 --]
next reply other threads:[~2019-09-16 1:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 1:45 Mark Brown [this message]
2019-09-16 13:16 ` linux-next: manual merge of the kselftest tree with the tpmdd tree Anders Roxell
2019-09-16 13:42 ` Mark Brown
2019-09-16 14:05 ` shuah
2019-09-16 18:39 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190916014535.GU4352@sirena.co.uk \
--to=broonie@kernel$(echo .)org \
--cc=anders.roxell@linaro$(echo .)org \
--cc=jarkko.sakkinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pvorel@suse$(echo .)cz \
--cc=shuah@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox