David S. Miller 5cd3da4ba2 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-03 10:29:26 +09:00
..
bnx2x_cmn.c	bnx2x: Fix receiving tx-timeout in error or recovery state.	2018-06-30 18:48:02 +09:00
bnx2x_cmn.h	bnx2x: Eliminate duplicate barriers on weakly-ordered archs	2018-03-26 12:47:55 -04:00
bnx2x_dcb.c	bnx2x: extend DCBx support	2016-02-16 20:12:16 -05:00
bnx2x_dcb.h
bnx2x_dump.h
bnx2x_ethtool.c	bnx2x: Eliminate duplicate barriers on weakly-ordered archs	2018-03-26 12:47:55 -04:00
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-03-08 12:34:12 -05:00
bnx2x_init_ops.h
bnx2x_init.h
bnx2x_link.c	bnx2x: Mark expected switch fall-throughs	2018-06-30 18:43:13 +09:00
bnx2x_link.h
bnx2x_main.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-07-03 10:29:26 +09:00
bnx2x_mfw_req.h
bnx2x_reg.h	bnx2x: Fix 84833 phy command handler	2016-02-21 22:50:55 -05:00
bnx2x_sp.c	bnx2x: Mark expected switch fall-throughs	2018-06-30 18:43:13 +09:00
bnx2x_sp.h	bnx2x: Don't flush multicast MACs	2016-08-24 09:45:20 -07:00
bnx2x_sriov.c	bnx2x: Mark expected switch fall-throughs	2018-06-30 18:43:13 +09:00
bnx2x_sriov.h	bnx2x: Deprecate pci_get_bus_and_slot()	2018-01-17 08:16:46 -06:00
bnx2x_stats.c
bnx2x_stats.h
bnx2x_vfpf.c	bnx2x: Eliminate duplicate barriers on weakly-ordered archs	2018-03-26 12:47:55 -04:00
bnx2x_vfpf.h	bnx2x: add vlan filtering offload	2015-07-29 23:24:45 -07:00
bnx2x.h	bnx2x: Fix receiving tx-timeout in error or recovery state.	2018-06-30 18:48:02 +09:00
Makefile