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
..
acpi
asm-generic
clocksource
crypto
drm
dt-bindings
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
pcmcia
ras
rdma
scsi	scsi: libiscsi: Remove iscsi_destroy_session	2017-10-02 22:23:21 -04:00
soc
sound	ALSA: hda - Fix incorrect TLV callback check introduced during set_fs() removal	2017-10-18 12:27:00 +02:00
target
trace	bpf: permit multiple bpf attachments for a single perf event	2017-10-25 10:47:47 +09:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
video
xen