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
..
accounting
arch	tools include: Sync kernel ABI headers with tooling headers	2017-09-25 10:39:44 -03:00
bpf	tools: bpftool: add bash completion for bpftool	2017-10-29 18:37:33 +09:00
build	tools build tests: Don't hardcode gcc name	2017-08-28 16:44:44 -03:00
cgroup
firewire
gpio
hv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-09-06 14:45:08 -07:00
iio
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
kvm/kvm_stat
laptop
leds
lib	libbpf: use map_flags when creating maps	2017-10-05 21:42:28 -07:00
nfsd
objtool	objtool: Fix memory leak in decode_instructions()	2017-10-20 09:43:21 +02:00
pci	tools: PCI: Add a missing option help line	2017-08-29 16:03:34 -05:00
pcmcia
perf	perf test shell trace+probe_libc_inet_pton.sh: Be compatible with Debian/Ubuntu	2017-10-18 09:14:18 -03:00
power	Kbuild fixes for v4.14 (2nd)	2017-10-28 11:01:57 -07:00
scripts	kbuild: revert $(realpath ...) to $(shell cd ... && /bin/pwd)	2017-10-07 20:08:02 +09:00
spi
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
thermal/tmon
time
usb	usbip: auto retry for concurrent attach	2017-08-31 18:08:45 +02:00
virtio
vm
Makefile	tools: rename tools/net directory to tools/bpf	2017-10-04 21:45:05 -07:00