linux_dsm_epyc7002/drivers/net/ethernet/intel/ixgbe
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-19 01:24:22 -05:00
..
ixgbe_82598.c ixgbe: add support for quad-port x520 adapter 2013-07-31 02:26:15 -07:00
ixgbe_82599.c ixgbe: Fix incorrect logic for fixed fiber eeprom write 2014-01-16 15:34:25 -08:00
ixgbe_common.c ixgbe: Check return value on eeprom reads 2013-08-29 02:45:38 -07:00
ixgbe_common.h ixgbe: Check for adapter removal on register writes 2014-01-14 18:59:17 -08:00
ixgbe_dcb_82598.c ixgbe: Fix Tx Hang issue with lldpad on 82598EB 2013-07-28 13:17:17 -07:00
ixgbe_dcb_82598.h ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_dcb_82599.c ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_dcb_82599.h IXGBE: Set the SW prio_tc values at initialization to the HW setting. 2013-05-21 03:14:21 -07:00
ixgbe_dcb_nl.c IXGBE: Set the SW prio_tc values at initialization to the HW setting. 2013-05-21 03:14:21 -07:00
ixgbe_dcb.c IXGBE: Set the SW prio_tc values at initialization to the HW setting. 2013-05-21 03:14:21 -07:00
ixgbe_dcb.h IXGBE: Set the SW prio_tc values at initialization to the HW setting. 2013-05-21 03:14:21 -07:00
ixgbe_debugfs.c ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_ethtool.c ixgbe: Additional adapter removal checks 2014-01-14 18:59:17 -08:00
ixgbe_fcoe.c drivers: net: Remove remaining alloc/OOM messages 2013-02-08 17:44:39 -05:00
ixgbe_fcoe.h ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_lib.c ixgbe: Use pci_enable_msix_range() instead of pci_enable_msix() 2014-02-18 15:33:31 -05:00
ixgbe_main.c netdevice: add queue selection fallback handler for ndo_select_queue 2014-02-17 00:36:34 -05:00
ixgbe_mbx.c ixgbe: Check for adapter removal on register writes 2014-01-14 18:59:17 -08:00
ixgbe_mbx.h ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_phy.c ixgbe: Check for adapter removal on register writes 2014-01-14 18:59:17 -08:00
ixgbe_phy.h ixgbe: Make ixgbe_identify_qsfp_module_generic static 2013-11-30 00:21:47 -08:00
ixgbe_ptp.c ixgbe: fix lockdep annotation issue for ptp's work item 2013-07-31 01:00:57 -07:00
ixgbe_sriov.c ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63 2014-01-17 18:37:31 -08:00
ixgbe_sriov.h ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63 2014-01-17 18:37:31 -08:00
ixgbe_sysfs.c ixgbe: Start temperature sensor attribute index with 1 2013-12-17 22:43:07 -08:00
ixgbe_type.h ixgbe: Clear head write-back registers on VF reset 2014-01-15 21:48:18 -08:00
ixgbe_x540.c ixgbe: Cleanup the use of tabs and spaces 2013-10-01 12:49:49 -04:00
ixgbe.h ixgbe: add braces around else condition in ixgbe_qv_lock_* calls 2014-01-17 18:56:59 -08:00
Makefile ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00