David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

Makefile

qed: Add iSCSI out of order packet handling.

2016-12-02 12:44:38 -05:00

qed_cxt.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_cxt.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_dcbx.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_dcbx.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_debug.c

qed: Additional work toward cleaning C=1

2016-10-14 11:07:22 -04:00

qed_debug.h

qed: Add support for debug data collection

2016-09-07 17:46:59 -07:00

qed_dev_api.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_dev.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_hsi.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_hw.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_hw.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_init_fw_funcs.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_init_ops.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_init_ops.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_int.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_int.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_iscsi.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_iscsi.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_l2.c

qed: Replace memset with eth_zero_addr

2017-01-17 15:24:47 -05:00

qed_l2.h

qed*: RSS indirection based on queue-handles

2017-01-01 21:02:14 -05:00

qed_ll2.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

qed_ll2.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

qed_main.c

qed*: Change maximal number of queues

2017-01-01 21:02:14 -05:00

qed_mcp.c

qed: Conserve RDMA resources when !QEDR

2017-01-01 21:02:14 -05:00

qed_mcp.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_ooo.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_ooo.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_reg_addr.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_roce.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05:00

qed_roce.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_selftest.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_selftest.h

qed: Add nvram selftest

2016-10-31 15:52:35 -04:00

qed_sp_commands.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_sp.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_spq.c

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed_sriov.c

qed: Replace memset with eth_zero_addr

2017-01-17 15:24:47 -05:00

qed_sriov.h

qed*: Add support for ndo_set_vf_trust

2017-01-01 21:02:14 -05:00

qed_vf.c

qed*: RSS indirection based on queue-handles

2017-01-01 21:02:14 -05:00

qed_vf.h

qed*: Update to dual-license

2017-01-01 21:02:14 -05:00

qed.h

qed*: Advance driver versions to 8.10.10.20.

2017-01-01 21:02:14 -05:00