David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
auxdisplay
blackfin
bpf	samples/bpf: adjust rlimit RLIMIT_MEMLOCK for xdp_redirect_map	2017-10-29 12:17:32 +09:00
configfs
connector
hidraw
hw_breakpoint
kdb
kfifo
kobject
kprobes
livepatch
mei
mic/mpssd
pktgen
rpmsg
seccomp
sockmap
statx
timers
trace_events	Fix tracing sample code warning.	2017-10-27 20:35:31 -07:00
trace_printk
uhid
v4l
vfio-mdev
watchdog
Kconfig
Makefile