David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -07:00
..
accel.h	net/mlx5: IPSec, Add support for ESN	2018-03-07 15:54:36 -08:00
cmd.h
cq.h	net/mlx5: Set uid as part of CQ commands	2018-09-25 09:52:35 +03:00
device.h	Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into net-next	2018-10-17 14:13:36 -07:00
doorbell.h	IB/mlx5: Use blue flame register allocator in mlx5_ib	2017-01-09 20:25:08 +02:00
driver.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-19 11:03:06 -07:00
eswitch.h	net/mlx5: E-Switch, Avoid setup attempt if not being e-switch manager	2018-06-26 15:26:29 -07:00
fs_helpers.h	{net,IB}/mlx5: Add ipsec helper	2018-04-04 12:06:27 -06:00
fs.h	net/mlx5: Add a no-append flow insertion mode	2018-10-17 14:18:50 -07:00
mlx5_ifc_fpga.h	net/mlx5: Accel, add TLS rx offload routines	2018-07-16 00:13:11 -07:00
mlx5_ifc.h	net/mlx5: Added "per_lane_error_counters" cap bit to PCAM	2018-10-18 13:32:36 -07:00
port.h	net/mlx5e: PFC stall prevention support	2018-03-26 13:46:46 -07:00
qp.h	net/mlx5: Set uid as part of QP commands	2018-09-25 09:52:39 +03:00
srq.h	net/mlx5: Set uid as part of SRQ commands	2018-09-25 09:52:52 +03:00
transobj.h	net/mlx5e: Avoid unbounded peer devices when unpairing TC hairpin rules	2018-10-01 10:58:00 -07:00
vport.h	net/mlx5: Cache the system image guid	2018-10-01 11:32:47 -07:00