linux_dsm_epyc7002/include/linux/mlx5
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07:00
..
cmd.h
cq.h
device.h net/mlx5: Introduce sniffer steering hardware capabilities 2016-08-18 18:49:59 +03:00
doorbell.h
driver.h net/mlx5: Introduce attach/detach to interface API 2016-09-10 21:21:49 -07:00
fs.h net/mlx5: Add sniffer namespaces 2016-08-18 18:49:59 +03:00
mlx5_ifc.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-12 15:52:44 -07:00
port.h net/mlx5: Separate query_port_proto_oper for IB and EN 2016-08-18 18:49:52 +03:00
qp.h
srq.h
transobj.h
vport.h