AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
67ddc87f16
linux_dsm_epyc7002/drivers/net/ethernet/broadcom/bnx2x
History
David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
	net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-05 20:32:02 -05:00
..
bnx2x_cmn.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
bnx2x_cmn.h bnx2x: Remove hidden flow control goto from BNX2X_ALLOC macros 2014-02-25 17:36:35 -05:00
bnx2x_dcb.c bnx2x: (semantic) revise scheduling of sp_rtnl 2014-02-12 19:15:42 -05:00
bnx2x_dcb.h bnx2x: Change DCB context handling 2013-08-20 00:21:47 -07:00
bnx2x_dump.h bnx2x: Revise comments and alignment 2013-06-02 21:36:47 -07:00
bnx2x_ethtool.c bnx2x: Fix generic option settings 2014-01-28 18:08:57 -08:00
bnx2x_fw_defs.h bnx2x: Remove unnecessary internal mem config 2014-02-12 19:15:41 -05:00
bnx2x_fw_file_hdr.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_hsi.h bnx2x: utilize FW 7.8.19 2014-02-12 19:15:42 -05:00
bnx2x_init_ops.h bnx2x: Remove many sparse warnings 2013-01-23 13:58:29 -05:00
bnx2x_init.h bnx2x: Don't pretend during register dump 2013-10-21 18:31:36 -04:00
bnx2x_link.c bnx2x: fix sparse warning 2014-01-15 15:06:47 -08:00
bnx2x_link.h bnx2x: namespace and dead code cleanups 2014-01-13 11:59:47 -08:00
bnx2x_main.c bnx2x: save RAM in kdump kernel by disabling TPA 2014-02-26 15:27:50 -05:00
bnx2x_mfw_req.h bnx2x: Introduce 2013 and advance version to 1.78.02 2013-01-15 15:07:59 -05:00
bnx2x_reg.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
bnx2x_sp.c bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_sp.h bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_sriov.c bnx2x: Remove hidden flow control goto from BNX2X_ALLOC macros 2014-02-25 17:36:35 -05:00
bnx2x_sriov.h bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_stats.c bnx2x: Lock DMAE when used by statistic flow 2013-10-21 18:31:35 -04:00
bnx2x_stats.h bnx2x: Fix VF stats sync 2013-08-27 22:03:04 -04:00
bnx2x_vfpf.c bnx2x: Revise IOV vlan/mac validation 2014-02-12 19:15:42 -05:00
bnx2x_vfpf.h bnx2x: Add support in PF driver for RSC 2014-02-12 19:15:41 -05:00
bnx2x.h bnx2x: utilize FW 7.8.19 2014-02-12 19:15:42 -05:00
Makefile bnx2x: Segregate SR-IOV code 2013-01-07 19:49:14 -08:00