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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20141205220456.60b39852@canb.auug.org.au>
Date:	Fri, 5 Dec 2014 22:04:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	Shuah Khan <shuahkh@....samsung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tim Bird <tim.bird@...ymobile.com>,
	David Drysdale <drysdale@...gle.com>
Subject: linux-next: manual merge of the akpm-current tree with the
 kselftest-fixes tree

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@...b.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

Content of type "application/pgp-signature" skipped