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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 13 Apr 2015 20:16:55 +1000

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                    [email-masked]

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