David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
breakpoints	add breakpoints/.gitignore	2016-01-07 13:38:24 -07:00
capabilities	selftests/capabilities: clean up for Makefile	2015-11-23 13:20:10 -07:00
cpu-hotplug	selftests: change cpu on-off-test.sh name to be unique	2015-04-01 10:32:52 -06:00
efivarfs	efi: Make efivarfs entries immutable by default	2016-02-10 16:25:52 +00:00
exec	selftests: exec: revert to default emit rule	2015-09-14 16:45:05 -06:00
firmware	selftests: firmware: add empty string and async tests	2016-01-07 14:41:07 -07:00
ftrace	ftracetest: Add instance create and delete test	2015-11-24 09:29:14 -05:00
futex	tools:testing/selftests: fix typo in futex/README	2015-11-16 19:22:49 -07:00
intel_pstate	tools, testing, add test for intel_pstate driver	2015-11-23 13:30:59 -07:00
ipc	selftest/ipc: enable cross compilation	2015-04-02 12:41:52 -06:00
kcmp	selftests: Set CC using CROSS_COMPILE once in lib.mk	2015-03-19 15:16:51 -06:00
lib	test_bitmap: unit tests for lib/bitmap.c	2016-02-19 22:54:09 -05:00
membarrier	membarrier: clean up selftest	2015-09-22 15:09:53 -07:00
memfd	selftests: Make scripts executable	2015-11-03 16:54:57 -07:00
memory-hotplug	selftests: Change memory on-off-test.sh name to be unique	2015-04-01 10:33:02 -06:00
mount	selftests/mount: output WARN messages when mount test skipped	2015-05-26 15:58:06 -06:00
mqueue	selftests: Add missing #include directives	2015-11-03 16:53:53 -07:00
net	soreuseport: BPF selection functional test for TCP	2016-02-11 03:54:15 -05:00
powerpc	selftests/powerpc: Add script to test HMI functionality	2015-12-17 10:46:43 +11:00
pstore	selftests/pstore: add pstore test scripts going with reboot	2015-10-15 20:00:32 -06:00
ptrace	add ptrace/.gitignore	2016-01-07 13:38:11 -07:00
rcutorture	torture: Place console.log files correctly from the get-go	2015-12-05 17:58:34 -08:00
seccomp	linux-kselftest-4.5-rc1	2016-01-17 13:31:50 -08:00
size	selftests: Set CC using CROSS_COMPILE once in lib.mk	2015-03-19 15:16:51 -06:00
static_keys	selftests: Make scripts executable	2015-11-03 16:54:57 -07:00
sysctl	selftests: Add install target	2015-03-13 15:21:56 -06:00
timers	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-01-31 15:49:06 -08:00
user	selftests: Introduce minimal shared logic for running tests	2015-03-13 15:13:40 -06:00
vm	update .gitignore in selftests/vm	2016-01-07 13:37:41 -07:00
x86	selftests/x86: Test __kernel_sigreturn and __kernel_rt_sigreturn	2016-01-13 10:34:40 +01:00
zram	seltests/zram: fix syntax error	2015-09-14 16:40:57 -06:00
gen_kselftest_tar.sh	selftests: Add tool to generate kselftest tar archive	2015-03-24 08:43:19 -06:00
kselftest_install.sh	selftests: Add kselftest install tool	2015-03-24 08:43:05 -06:00
kselftest.h	kselftest: Add exit code defines	2015-05-26 15:58:08 -06:00
lib.mk	selftests: change install command to rsync	2015-09-14 16:43:51 -06:00
Makefile	selftest/ipc: actually test it	2015-11-23 13:21:15 -07:00