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

2015-04-13 Thread Stephen Rothwell
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 powerp

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

2015-03-23 Thread Stephen Rothwell
Hi Shuah, Today's linux-next merge of the kselftest tree got a conflict in tools/testing/selftests/powerpc/Makefile between commit a908f5de3b10 ("selftests/powerpc: Rename TARGETS in powerpc selftests makefile") from the powerpc-mpe tree and commit 6faeeea44b84 ("selftests: Add install support for