leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f675f93a79
linux/drivers/net/ethernet/broadcom/bnx2x
History
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
bnx2x_cmn.c bnx2: Fix bandwidth allocation for some MF modes 2015-08-17 10:27:57 -07:00
bnx2x_cmn.h bnx2x: Fix vxlan endianity issue 2015-08-20 14:08:08 -07:00
bnx2x_dcb.c bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_dcb.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_dump.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-20 06:08:27 -07:00
bnx2x_fw_defs.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_fw_file_hdr.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_hsi.h bnx2x: Add BD support for storage 2015-08-06 21:54:13 -07:00
bnx2x_init_ops.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_init.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_link.c bnx2x: Add 84858 phy support 2015-07-22 10:47:26 -07:00
bnx2x_link.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_main.c bnx2x: track vxlan port count 2015-09-17 22:32:16 -07:00
bnx2x_mfw_req.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_reg.h bnx2x: new Multi-function mode - BD 2015-07-22 10:47:26 -07:00
bnx2x_sp.c bnx2x: byte swap rss_key to comply to Toeplitz specs 2015-09-24 14:34:49 -07:00
bnx2x_sp.h bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x_sriov.c bnx2x: Correct logic for pvid configuration. 2015-08-02 17:18:24 -07:00
bnx2x_sriov.h bnx2x: Fix compilation when CONFIG_BNX2X_SRIOV is not set 2015-07-30 09:52:18 -07:00
bnx2x_stats.c bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_stats.h bnx2x: Rebrand from 'broadcom' into 'qlogic' 2015-07-22 10:47:26 -07:00
bnx2x_vfpf.c bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x_vfpf.h bnx2x: add vlan filtering offload 2015-07-29 23:24:45 -07:00
bnx2x.h bnx2x: track vxlan port count 2015-09-17 22:32:16 -07:00
Makefile bnx2x: Segregate SR-IOV code 2013-01-07 19:49:14 -08:00