David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
auxdisplay
blackfin
bpf	samples/bpf: add gre sequence number test.	2018-03-04 18:35:02 -05:00
configfs
connector
hidraw
hw_breakpoint
kdb
kfifo
kobject
kprobes
livepatch
mei
mic/mpssd
pktgen
rpmsg
seccomp	samples/seccomp: do not compile when cross compiled	2018-02-22 09:31:43 -08:00
sockmap	bpf: samples/sockmap detach sock ops program	2018-02-13 17:46:53 -08:00
statx
timers
trace_events
trace_printk
uhid
v4l
vfio-mdev
watchdog
Kconfig
Makefile