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
..
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace	2017-09-11 18:34:47 -07:00
drm	Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next	2017-08-29 10:38:14 +10:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
misc	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
mtd	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
rdma	IB/core: Fix typo in the name of the tag-matching cap struct	2017-09-25 11:47:23 -04:00
scsi	scsi: cxlflash: Support AFU debug	2017-06-26 15:01:12 -04:00
sound	Merge remote-tracking branch 'asoc/topic/intel' into asoc-next	2017-09-01 12:12:19 +01:00
video	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
xen	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00