linux_dsm_epyc7002/drivers/net/ethernet/sfc
David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-08-30 00:54:02 -04:00
..
bitfield.h
ef10_regs.h sfc: Remove unused definitions of EF10 user-mode DMA descriptors 2014-02-12 17:53:34 -05:00
ef10_sriov.c sfc: Fix VLAN filtering feature if vPort has VLAN_RESTRICT flag 2016-06-15 22:26:27 -07:00
ef10_sriov.h sfc: Fix VLAN filtering feature if vPort has VLAN_RESTRICT flag 2016-06-15 22:26:27 -07:00
ef10.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-30 00:54:02 -04:00
efx.c sfc: get timer configuration from adapter 2016-08-12 20:42:20 -07:00
efx.h sfc: set interrupt moderation via MCDI 2016-08-12 20:42:20 -07:00
enum.h sfc: Change entity reset on MC reboot to a new datapath-only reset. 2015-05-21 18:43:54 -04:00
ethtool.c sfc: implement IPv6 NFC (and IPV4_USER_FLOW) 2016-02-11 07:16:18 -05:00
falcon_boards.c
falcon.c sfc: get timer configuration from adapter 2016-08-12 20:42:20 -07:00
farch_regs.h
farch.c sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
filter.h sfc: Use ether_addr_copy and eth_broadcast_addr 2014-03-10 13:53:37 -04:00
io.h sfc: PIO:Restrict to 64bit arch and use 64-bit writes. 2014-06-11 15:36:21 -07:00
Kconfig sfc: add sysfs entry to control MCDI tracing 2015-05-27 13:54:51 -04:00
Makefile sfc: Enable VF's via a write to the sysfs file sriov_numvfs 2015-05-09 16:16:46 -04:00
mcdi_mon.c
mcdi_pcol.h sfc: update MCDI protocol headers 2016-08-12 20:42:19 -07:00
mcdi_port.c sfc: report supported link speeds on SFP connections 2016-06-08 11:18:45 -07:00
mcdi.c sfc: allow asynchronous MCDI without completion function 2016-08-12 20:42:19 -07:00
mcdi.h sfc: Handle MCDI proxy authorisation 2015-12-23 22:06:39 -05:00
mdio_10g.c
mdio_10g.h
mtd.c
net_driver.h sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
nic.c sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
nic.h sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
phy.h
ptp.c sfc: set interrupt moderation via MCDI 2016-08-12 20:42:20 -07:00
qt202x_phy.c
rx.c sfc: Track RPS flow IDs per channel instead of per function 2016-05-31 20:30:25 -07:00
selftest.c sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
selftest.h sfc: work around TRIGGER_INTERRUPT command not working on SFC9140 2016-08-26 21:43:52 -07:00
siena_sriov.c sfc: save old MAC address in case sriov_mac_address_changed fails 2015-05-21 18:43:53 -04:00
siena_sriov.h sfc: save old MAC address in case sriov_mac_address_changed fails 2015-05-21 18:43:53 -04:00
siena.c sfc: get timer configuration from adapter 2016-08-12 20:42:20 -07:00
sriov.c sfc: Implement ndo_gets_phys_port_id() for EF10 VFs 2015-06-02 12:57:26 -07:00
sriov.h sfc: Implement ndo_gets_phys_port_id() for EF10 VFs 2015-06-02 12:57:26 -07:00
tenxpress.c
tx.c net: relax setup_tc ndo op handle restriction 2016-03-03 16:25:15 -05:00
txc43128_phy.c sfc: fix a timeout loop 2015-12-15 12:46:26 -05:00
vfdi.h ethernet: codespell comment spelling fixes 2015-03-08 22:54:22 -04:00
workarounds.h sfc: set interrupt moderation via MCDI 2016-08-12 20:42:20 -07:00