From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Shuah Khan <shuahkh@osg•samsung.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tim Bird <tim.bird@sonymobile•com>,
David Drysdale <drysdale@google•com>
Subject: linux-next: manual merge of the akpm-current tree with the kselftest-fixes tree
Date: Fri, 5 Dec 2014 22:04:56 +1100 [thread overview]
Message-ID: <20141205220456.60b39852@canb.auug.org.au> (raw)
[-- 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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
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 --]
reply other threads:[~2014-12-05 11:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20141205220456.60b39852@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=drysdale@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shuahkh@osg$(echo .)samsung.com \
--cc=tim.bird@sonymobile$(echo .)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