openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/ethernet/qlogic/qlcnic
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
..
Makefile qlcnic: dcb: Query adapter DCB capabilities. 2013-08-27 15:21:13 -04:00
qlcnic.h qlcnic: Update version to 5.3.56 2014-02-24 18:43:19 -05:00
qlcnic_83xx_hw.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
qlcnic_83xx_hw.h qlcnic: Re-factor firmware minidump template header handling 2014-02-24 18:43:19 -05:00
qlcnic_83xx_init.c qlcnic: Enhance Tx timeout debugging. 2014-01-23 16:13:09 -08:00
qlcnic_83xx_vnic.c qlcnic: Use bool for rx_mac_learn. 2014-01-23 16:13:08 -08:00
qlcnic_ctx.c qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_dcb.c qlcnic: dcb: a couple off by one bugs 2014-03-03 15:38:12 -05:00
qlcnic_dcb.h qlcnic: Issue INIT_NIC command only once. 2013-12-17 17:09:43 -05:00
qlcnic_ethtool.c qlcnic: Re-factor firmware minidump template header handling 2014-02-24 18:43:19 -05:00
qlcnic_hdr.h qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_hw.c qlcnic: Enhance semaphore lock access failure error message 2014-02-24 18:43:19 -05:00
qlcnic_hw.h qlcnic: Re-factor firmware minidump template header handling 2014-02-24 18:43:19 -05:00
qlcnic_init.c qlcnic: Fix bug in Tx completion path 2014-01-03 20:44:11 -05:00
qlcnic_io.c qlcnic: Fix loopback test failure 2014-01-28 11:59:30 -08:00
qlcnic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
qlcnic_minidump.c qlcnic: Re-factor firmware minidump template header handling 2014-02-24 18:43:19 -05:00
qlcnic_sriov.h qlcnic: make local functions static 2014-01-17 18:04:19 -08:00
qlcnic_sriov_common.c qlcnic: Fix initialization of vlan list. 2014-01-28 11:59:30 -08:00
qlcnic_sriov_pf.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
qlcnic_sysfs.c qlcnic: Updates to QLogic application/driver interface for virtual NIC configuration 2014-02-24 18:43:19 -05:00