linux_old1/tools/testing/selftests
Alexei Starovoitov 89c0a36130 selftests/bpf: fix merge conflict
fix artifact of merge resolution

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-06 12:21:59 -07:00
..
bpf selftests/bpf: fix merge conflict 2017-04-06 12:21:59 -07:00
breakpoints selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
capabilities selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
cpu-hotplug selftests: create test-specific kconfig fragments 2016-02-25 09:47:52 -07:00
cpufreq selftest: cpufreq: Add special tests 2017-01-19 10:32:27 -07:00
drivers/gpu Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-next 2017-01-09 09:55:57 +10:00
efivarfs selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
exec selftests: enable O and KBUILD_OUTPUT 2017-01-05 13:42:22 -07:00
filesystems selftests: move dnotify_test from Documentation/filesystems 2016-09-20 09:09:00 -06:00
firmware driver core patches for 4.11-rc1 2017-02-22 11:44:32 -08:00
ftrace selftests: enable O and KBUILD_OUTPUT 2017-01-05 13:42:22 -07:00
futex selftests/futex: Add headers to makefile dependencies 2017-01-19 10:30:21 -07:00
gpio selftests: gpio add .gitignore for generated files 2017-01-11 09:50:54 -07:00
ia64 selftests: move ia64 tests from Documentation/ia64 2016-09-20 09:58:12 -06:00
intel_pstate selftests/intel_pstate: Update makefile to match new style 2017-01-19 10:30:40 -07:00
ipc selftests: ipc add missing generated file to .gitignore 2017-01-11 09:51:03 -07:00
kcmp selftests: enable O and KBUILD_OUTPUT 2017-01-05 13:42:22 -07:00
lib lib: Add a simple prime number generator 2016-12-27 12:30:56 +01:00
locking locking/ww_mutex: Add ww_mutex to tools/testing/selftests 2017-01-14 11:37:17 +01:00
media_tests selftests: media_tests add a new video device test 2016-07-26 09:59:30 -06:00
membarrier selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
memfd selftests: remove CROSS_COMPILE in dedicated Makefile 2017-01-05 13:42:11 -07:00
memory-hotplug selftests: create test-specific kconfig fragments 2016-02-25 09:47:52 -07:00
mount selftests: add default rules for c source file 2017-01-05 13:42:01 -07:00
mqueue selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
net selftests: add a generic testsuite for ethernet device 2017-04-05 08:30:11 -07:00
networking/timestamping selftests: Move networking/timestamping from Documentation 2016-09-20 09:59:50 -06:00
nsfs selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
ntb ntb_test: Add a selftest script for the NTB subsystem 2016-08-05 10:21:08 -04:00
powerpc selftests/powerpc: Replace stxvx and lxvx with stxvd2x/lxvd2x 2017-03-09 13:58:00 +11:00
prctl selftests: move prctl tests from Documentation/prctl 2016-09-20 09:09:09 -06:00
pstore selftests: add EXTRA_CLEAN for clean target 2017-01-05 13:42:17 -07:00
ptp selftests: move ptp tests from Documentation/ptp 2016-09-20 09:54:38 -06:00
ptrace selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
rcutorture Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2017-02-20 13:23:30 -08:00
seccomp selftests: remove duplicated all and clean target 2017-01-05 13:41:35 -07:00
sigaltstack tools/testing/selftests/sigaltstack/sas.c: improve output of sigaltstack testcase 2017-02-27 18:43:45 -08:00
size selftests: add default rules for c source file 2017-01-05 13:42:01 -07:00
splice selftest for default_file_splice_read() infoleak 2017-02-18 22:07:24 -05:00
static_keys selftests: create test-specific kconfig fragments 2016-02-25 09:47:52 -07:00
sync selftest: sync: improve assert() failure message 2016-12-13 07:24:34 -07:00
sysctl selftests: Add install target 2015-03-13 15:21:56 -06:00
timers selftests: remove CROSS_COMPILE in dedicated Makefile 2017-01-05 13:42:11 -07:00
user selftests: create test-specific kconfig fragments 2016-02-25 09:47:52 -07:00
vDSO selftests: move vDSO tests from Documentation/vDSO 2016-09-20 09:58:04 -06:00
vm userfaultfd: selftest: vm: allow to build in vm/ directory 2017-03-09 17:01:10 -08:00
watchdog selftests: move watchdog tests from Documentation/watchdog 2016-09-20 09:58:34 -06:00
x86 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2017-03-07 14:47:24 -08:00
zram selftests: add EXTRA_CLEAN for clean target 2017-01-05 13:42:17 -07:00
.gitignore selftests: add missing gitignore files/dirs 2016-12-08 08:51:32 -07:00
Makefile Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2017-03-03 21:44:35 -08:00
gen_kselftest_tar.sh selftests: Add tool to generate kselftest tar archive 2015-03-24 08:43:19 -06:00
kselftest.h kselftest: Add exit code defines 2015-05-26 15:58:08 -06:00
kselftest_install.sh selftests: Add kselftest install tool 2015-03-24 08:43:05 -06:00
lib.mk selftests: lib.mk Fix individual test builds 2017-03-02 07:53:01 -07:00