linux_dsm_epyc7002/drivers/net/ethernet/intel/ixgbe
David S. Miller 4366004d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-24 13:19:00 -04:00
..
ixgbe_82598.c ixgbe: convert low_water into an array 2014-04-22 23:07:11 -07:00
ixgbe_82599.c ixgbe: Stop cacheing if the MNG FW enabled 2014-03-20 00:52:36 -07:00
ixgbe_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-04-24 13:19:00 -04:00
ixgbe_common.h ixgbe: Use out-of-line function for register reads 2014-04-22 23:20:54 -07:00
ixgbe_dcb_82598.c ixgbe: convert low_water into an array 2014-04-22 23:07:11 -07:00
ixgbe_dcb_82598.h ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00
ixgbe_dcb_82599.c ixgbe: convert low_water into an array 2014-04-22 23:07:11 -07:00
ixgbe_dcb_82599.h ixgbe: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -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: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -07:00
ixgbe_ethtool.c net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq 2014-03-14 22:41:36 -04:00
ixgbe_fcoe.c ixgbe: Convert uses of __constant_<foo> to <foo> 2014-03-19 22:47:33 -07:00
ixgbe_fcoe.h ixgbe: convert low_water into an array 2014-04-22 23:07:11 -07:00
ixgbe_lib.c ixgbe: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -07:00
ixgbe_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-04-24 13:19:00 -04:00
ixgbe_mbx.c ixgbe: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -07:00
ixgbe_mbx.h ixgbe: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -07:00
ixgbe_phy.c e1000e/igb/ixgbe/i40e: fix message terminations 2014-04-18 18:41:24 -07:00
ixgbe_phy.h ixgbe: fix ixgbe_check_reset_blocked() declaration 2014-03-31 15:48:01 -07:00
ixgbe_ptp.c e1000e/igb/ixgbe/i40e: fix message terminations 2014-04-18 18:41:24 -07:00
ixgbe_sriov.c ixgbe: improve mac filter handling 2014-04-23 00:09:48 -07:00
ixgbe_sriov.h ixgbe: change handling of multicast filters 2014-04-22 23:54:43 -07:00
ixgbe_sysfs.c ixgbe: add Linux NICS mailing list to contact info 2014-03-12 19:05:30 -07:00
ixgbe_type.h ixgbe: convert low_water into an array 2014-04-22 23:07:11 -07:00
ixgbe_x540.c ixgbe: Stop cacheing if the MNG FW enabled 2014-03-20 00:52:36 -07:00
ixgbe.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-04-24 13:19:00 -04:00
Makefile ixgbe: update date to 2013 2013-02-05 01:44:13 -08:00