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
..
core	RDMA/netlink: OOPs in rdma_nl_rcv_msg() from misinterpreted flag	2017-10-25 14:54:43 -04:00
hw	qed: Fix iWARP out of order flow	2017-10-19 12:46:43 +01:00
sw	IB/rxe: Handle NETDEV_CHANGE events	2017-08-28 19:12:36 -04:00
ulp	IB/ipoib: Add ability to set PKEY index to lower device driver	2017-10-14 11:22:08 -07:00
Kconfig	IB/core: Expose ioctl interface through experimental Kconfig	2017-08-31 08:35:14 -04:00
Makefile	IB/rdmavt: Create module framework and handle driver registration	2016-03-10 20:37:04 -05:00