David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
cmd.h	net/mlx5_core: Fix Mellanox copyright note	2015-04-02 16:33:42 -04:00
cq.h	IB/mlx5: Support 4k UAR for libmlx5	2017-01-09 20:25:09 +02:00
device.h	net/mlx5: FPGA, Add SBU infrastructure	2017-06-27 16:36:47 +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: Delay events till ib registration ends	2017-08-07 10:47:07 +03: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: Increase the maximum flow counters supported	2017-08-07 10:47:07 +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: Add support for reading connector type from PTYS	2017-06-08 14:12:00 +03:00
qp.h	RDMA/mlx5: Fix existence check for extended address vector	2017-08-04 14:24:05 -04:00
srq.h	net/mlx5: Ensure SRQ physical address structure endianness	2016-10-30 15:43:10 +02: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: Push min-inline mode resolution helper into the core	2017-01-24 21:14:05 +02:00