LKML Archive on
help / color / mirror / Atom feed
* linux-next: manual merge of the akpm-current tree with the kselftest-fixes tree
@ 2014-12-05 11:04 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-12-05 11:04 UTC (permalink / raw)
  To: Andrew Morton, Shuah Khan
  Cc: linux-next, linux-kernel, Tim Bird, David Drysdale

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

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          

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-12-05 11:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-05 11:04 linux-next: manual merge of the akpm-current tree with the kselftest-fixes tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).