David S. Miller
36583eb54d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/ethernet/cadence/macb.c
drivers/net/phy/phy.c
include/linux/skbuff.h
net/ipv4/tcp.c
net/switchdev/switchdev.c
Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.
phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.
tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.
macb.c involved the addition of two zyncq device entries.
skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
breakpoints
selftests: Introduce minimal shared logic for running tests
2015-03-13 15:13:40 -06:00
cpu-hotplug
selftests: change cpu on-off-test.sh name to be unique
2015-04-01 10:32:52 -06:00
efivarfs
selftests: Set CC using CROSS_COMPILE once in lib.mk
2015-03-19 15:16:51 -06:00
exec
linux-kselftest-4.1-rc1
2015-04-13 08:59:21 -07:00
firmware
selftests: Introduce minimal shared logic for running tests
2015-03-13 15:13:40 -06:00
ftrace
ftracetest: Do not use usleep directly
2015-04-03 09:16:32 -06: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
memfd
selftest/memfd: include default header install path
2015-04-02 12:41:03 -06:00
memory-hotplug
selftests: Change memory on-off-test.sh name to be unique
2015-04-01 10:33:02 -06:00
mount
selftest/mount: enable cross compilation
2015-04-02 12:40:48 -06:00
mqueue
selftest/mqueue: enable cross compilation
2015-04-02 12:41:58 -06:00
net
selftests/net: expect headroom in psock_fanout rollover
2015-05-18 17:04:18 -04:00
powerpc
selftests/powerpc: Fix the pmu install rule
2015-05-01 13:00:26 +10:00
ptrace
selftests: Introduce minimal shared logic for running tests
2015-03-13 15:13:40 -06:00
rcutorture
Merge branches 'doc.2015.02.26a', 'earlycb.2015.03.03a', 'fixes.2015.03.03a', 'gpexp.2015.02.26a', 'hotplug.2015.03.20a', 'sysidle.2015.02.26b' and 'tiny.2015.02.26a' into HEAD
2015-03-20 08:31:01 -07:00
size
selftests: Set CC using CROSS_COMPILE once in lib.mk
2015-03-19 15:16:51 -06:00
sysctl
selftests: Add install target
2015-03-13 15:21:56 -06:00
timers
kselftests: timers: Make set-timer-lat fail more gracefully for !CAP_WAKE_ALARM
2015-04-02 10:32:33 -06:00
user
selftests: Introduce minimal shared logic for running tests
2015-03-13 15:13:40 -06:00
vm
mm, selftests: test return value of munmap for MAP_HUGETLB memory
2015-04-15 16:35:19 -07:00
x86
selftests, x86: Rework x86 target architecture detection
2015-05-12 20:02:40 -06:00
gen_kselftest_tar.sh
selftests: Add tool to generate kselftest tar archive
2015-03-24 08:43:19 -06:00
kselftest.h
selftests: add kselftest framework for uniform test reporting
2014-11-17 10:38:56 -07:00
kselftest_install.sh
selftests: Add kselftest install tool
2015-03-24 08:43:05 -06:00
lib.mk
selftests: Set CC using CROSS_COMPILE once in lib.mk
2015-03-19 15:16:51 -06:00
Makefile
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-04-13 13:16:36 -07:00