From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <shuahkh@osg•samsung.com>,
Michael Ellerman <mpe@ellerman•id.au>,
Benjamin Herrenschmidt <benh@kernel•crashing.org>,
linuxppc-dev@lists•ozlabs.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sam bobroff <sam.bobroff@au1•ibm.com>
Subject: linux-next: manual merge of the kselftest tree with the powerpc-mpe tree
Date: Mon, 13 Apr 2015 20:16:55 +1000 [thread overview]
Message-ID: <20150413201655.2fa3af76@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in
tools/testing/selftests/powerpc/tm/Makefile between commit 7fe924d9d71c
("selftests/powerpc: Add transactional syscall test") from the
powerpc-mpe tree and commit 6faeeea44b84 ("selftests: Add install
support for the powerpc tests") from the kselftest tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc tools/testing/selftests/powerpc/tm/Makefile
index 122cf1830de8,34f2ec634b40..000000000000
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@@ -1,18 -1,10 +1,13 @@@
- PROGS := tm-resched-dscr tm-syscall
-TEST_PROGS := tm-resched-dscr
++TEST_PROGS := tm-resched-dscr tm-syscall
- all: $(PROGS)
+ all: $(TEST_PROGS)
- $(PROGS): ../harness.c
+ $(TEST_PROGS): ../harness.c
+tm-syscall: tm-syscall-asm.S
+tm-syscall: CFLAGS += -mhtm
+
- run_tests: all
- @-for PROG in $(PROGS); do \
- ./$$PROG; \
- done;
+ include ../../lib.mk
clean:
- rm -f $(PROGS) *.o
-
- .PHONY: all run_tests clean
+ rm -f $(TEST_PROGS) *.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-13 10:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 10:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-03-24 6:37 linux-next: manual merge of the kselftest tree with the powerpc-mpe tree Stephen Rothwell
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=20150413201655.2fa3af76@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benh@kernel$(echo .)crashing.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mpe@ellerman$(echo .)id.au \
--cc=sam.bobroff@au1$(echo .)ibm.com \
--cc=shuahkh@osg$(echo .)samsung.com \
/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