David S. Miller 6f41617bf2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-10-03 21:00:17 -07:00

..

accel.h

net/mlx5: IPSec, Add support for ESN

2018-03-07 15:54:36 -08:00

cmd.h

net/mlx5_core: Fix Mellanox copyright note

2015-04-02 16:33:42 -04:00

cq.h

mlx5: Move dump error CQE function out of mlx5_ib for code sharing

2018-03-27 17:17:28 -07:00

device.h

net/mlx5: Rename modify/query_vport state related enums

2018-08-08 19:34:54 -07: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: Cache the system image guid

2018-10-01 11:32:47 -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

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

mlx5_ifc_fpga.h

net/mlx5: Accel, add TLS rx offload routines

2018-07-16 00:13:11 -07:00

mlx5_ifc.h

Merge branch 'linus/master' into rdma.git for-next

2018-08-16 14:21:29 -06:00

port.h

net/mlx5e: PFC stall prevention support

2018-03-26 13:46:46 -07:00

qp.h

net/mlx5: Add DCT command interface

2018-01-08 11:38:49 -07:00

srq.h

net/mlx5: Add XRQ support

2017-08-29 08:30:20 -04: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