linux-next: manual merge of the akpm-current tree with the kselftest-fixes tree

From: Stephen Rothwell
Date: Fri Dec 05 2014 - 06:05:15 EST

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
tools/testing/selftests/Makefile between commit 3ce51050fadd
("selftest: size: Add size test for Linux kernel") from the
kselftest-fixes tree and commit 4126d336d7c3 ("syscalls: add selftest
for execveat(2)") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc tools/testing/selftests/Makefile
index fa91aefc8d19,c14893b501a9..000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -15,7 -15,7 +15,8 @@@ TARGETS += use
TARGETS += sysctl
TARGETS += firmware
TARGETS += ftrace
+ TARGETS += exec
+TARGETS += size

TARGETS_HOTPLUG = cpu-hotplug
TARGETS_HOTPLUG += memory-hotplug

Attachment: pgpSijFUeNMOl.pgp
Description: OpenPGP digital signature