linux_dsm_epyc7002/drivers/net/ethernet/qlogic/qed
David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-21 20:23:53 -07:00
..
Makefile qed: Add support for hardware offloaded FCoE. 2017-02-19 18:10:42 -05:00
qed_cxt.c qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_cxt.h qed: Don't use main-ptt in unrelated flows 2017-04-06 14:26:31 -07:00
qed_dcbx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-04-21 20:23:53 -07:00
qed_dcbx.h qed: Move to new load request scheme 2017-03-28 18:05:23 -07:00
qed_debug.c qed*: Add support for QL41xxx adapters 2017-03-14 11:43:30 -07:00
qed_debug.h qed: Add support for debug data collection 2016-09-07 17:46:59 -07:00
qed_dev_api.h qed: Don't use main-ptt in unrelated flows 2017-04-06 14:26:31 -07:00
qed_dev.c qed: Inform qedi the number of possible CQs 2017-04-06 14:26:31 -07:00
qed_fcoe.c qed: Don't use main-ptt in unrelated flows 2017-04-06 14:26:31 -07:00
qed_fcoe.h qed: Add support for hardware offloaded FCoE. 2017-02-19 18:10:42 -05:00
qed_hsi.h qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_hw.c qed: Warn PTT usage by wrong hw-function 2017-04-06 14:26:31 -07:00
qed_hw.h qed: Revise QM cofiguration 2017-04-03 19:16:37 -07:00
qed_init_fw_funcs.c qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_init_ops.c qed*: Utilize Firmware 8.15.3.0 2017-03-13 15:33:09 -07:00
qed_init_ops.h qed*: Update to dual-license 2017-01-01 21:02:14 -05:00
qed_int.c qed: Revise QM cofiguration 2017-04-03 19:16:37 -07:00
qed_int.h qed*: Update to dual-license 2017-01-01 21:02:14 -05:00
qed_iscsi.c qed: Provide iSCSI statistics to management 2017-04-06 14:26:31 -07:00
qed_iscsi.h qed: Provide iSCSI statistics to management 2017-04-06 14:26:31 -07:00
qed_l2.c qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_l2.h qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_ll2.c qed: Don't use main-ptt in unrelated flows 2017-04-06 14:26:31 -07:00
qed_ll2.h qed: Add support for hardware offloaded FCoE. 2017-02-19 18:10:42 -05:00
qed_main.c qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_mcp.c qed: Add a missing error code 2017-04-05 06:53:42 -07:00
qed_mcp.h qed: Utilize resource-lock based scheme 2017-03-28 18:05:24 -07:00
qed_ooo.c qed: Make OOO archipelagos into an array 2017-04-06 14:26:31 -07:00
qed_ooo.h qed: Make OOO archipelagos into an array 2017-04-06 14:26:31 -07:00
qed_ptp.c qed*: Add support for QL41xxx adapters 2017-03-14 11:43:30 -07:00
qed_ptp.h qed: Add infrastructure for PTP support 2017-02-15 12:42:52 -05:00
qed_reg_addr.h qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_roce.c qed: Revise QM cofiguration 2017-04-03 19:16:37 -07:00
qed_roce.h qed*: Utilize Firmware 8.15.3.0 2017-03-13 15:33:09 -07: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: Add support for hardware offloaded FCoE. 2017-02-19 18:10:42 -05:00
qed_sp.h qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00
qed_spq.c qed: Don't use main-ptt in unrelated flows 2017-04-06 14:26:31 -07:00
qed_sriov.c qed: Revise QM cofiguration 2017-04-03 19:16:37 -07:00
qed_sriov.h qed: Make qed_iov_mark_vf_flr() return bool 2017-03-21 19:02:37 -07:00
qed_vf.c qed: Increase verbosity of VF -> PF errors 2017-03-21 19:02:36 -07:00
qed_vf.h qed: Deprecate VF multiple queue-stop 2017-03-21 19:02:37 -07:00
qed.h qed: aRFS infrastructure support 2017-04-17 13:06:18 -04:00