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
..
cmd.h	net/mlx5_core: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
cq.h	drivers, net, mlx5: convert mlx5_cq.refcount from atomic_t to refcount_t	2017-10-22 02:22:38 +01:00
device.h	net/mlx5: Fix FPGA capability location	2017-09-28 07:23:09 +03:00
doorbell.h	IB/mlx5: Use blue flame register allocator in mlx5_ib	2017-01-09 20:25:08 +02:00
driver.h	net/mlx5: PTP code migration to driver core section	2017-10-14 11:22:06 -07:00
fs.h	net/mlx5: Use underlay QPN from the root name space	2017-05-14 13:33:45 +03:00
mlx5_ifc.h	net/mlx5: Check device capability for maximum flow counters	2017-09-28 07:23:09 +03:00
mlx5_ifc_fpga.h	net/mlx5: Accel, Add IPSec acceleration interface	2017-06-27 16:36:47 +03:00
port.h	net/mlx5e: DCBNL, Implement tc with ets type and zero bandwidth	2017-10-26 00:47:27 -07:00
qp.h	RDMA/mlx5: Fix existence check for extended address vector	2017-08-04 14:24:05 -04:00
srq.h	net/mlx5: Add XRQ support	2017-08-29 08:30:20 -04:00
transobj.h	IB/mlx5: Support setting Ethernet priority for Raw Packet QPs	2016-01-21 12:01:09 -05:00
vport.h	net/mlx5: Add raw ethernet local loopback firmware command	2017-07-24 10:26:16 -04:00