David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-03-23 16:41:27 -07:00

..

falcon

mqprio: Modify mqprio to pass user parameters via ndo_setup_tc.

2017-03-15 15:20:27 -07:00

bitfield.h

sfc: process RX event inner checksum flags

2017-02-09 16:47:53 -05:00

ef10_regs.h

sfc: Update EF10 register definitions

2016-11-18 11:55:37 -05:00

ef10_sriov.c

sfc: do not device_attach if a reset is pending

2017-02-17 15:29:40 -05:00

ef10_sriov.h

sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV

2017-01-10 14:16:17 -05:00

ef10.c

sfc: fix IPID endianness in TSOv2

2017-03-03 10:06:38 -08:00

efx.c

sfc: cleanup a condition in efx_udp_tunnel_del()

2017-03-22 19:25:02 -07:00

efx.h

sfc: do not device_attach if a reset is pending

2017-02-17 15:29:40 -05:00

enum.h

sfc: remove RESET_TYPE_RX_RECOVERY

2016-12-01 15:39:38 -05:00

ethtool.c

sfc: process RX event inner checksum flags

2017-02-09 16:47:53 -05:00

farch_regs.h

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

farch.c

sfc: read back RX hash config from the NIC when querying it with ethtool -x

2017-01-17 15:49:52 -05:00

filter.h

sfc: insert catch-all filters for encapsulated traffic

2017-01-27 11:59:31 -05:00

io.h

sfc: PIO:Restrict to 64bit arch and use 64-bit writes.

2014-06-11 15:36:21 -07:00

Kconfig

ethernet: sfc: Add Kconfig entry for vendor Solarflare

2016-12-20 14:19:38 -05:00

Makefile

sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver

2016-11-30 10:16:58 -05:00

mcdi_mon.c

sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead

2016-12-03 16:11:00 -05:00

mcdi_pcol.h

scripts/spelling.txt: add "an one" pattern and fix typo instances

2017-02-27 18:43:46 -08:00

mcdi_port.c

net: sfc: use new api ethtool_{get|set}_link_ksettings

2016-12-17 21:31:41 -05:00

mcdi.c

sfc: configure UDP tunnel offload ports

2017-02-09 16:47:53 -05:00

mcdi.h

sfc: configure UDP tunnel offload ports

2017-02-09 16:47:53 -05:00

mtd.c

sfc: Update copyright banners

2013-08-29 23:34:51 +01:00

net_driver.h

sfc: MSI-X is the only interrupt mode for EF10 VFs

2017-02-14 12:43:18 -05:00

nic.c

sfc: work around TRIGGER_INTERRUPT command not working on SFC9140

2016-08-26 21:43:52 -07:00

nic.h

sfc: configure UDP tunnel offload ports

2017-02-09 16:47:53 -05:00

ptp.c

sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead

2016-12-03 16:11:00 -05:00

rx.c

sfc: set csum_level for encapsulated packets

2017-02-09 16:47:53 -05:00

selftest.c

sfc: do not device_attach if a reset is pending

2017-02-17 15:29:40 -05: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: MSI-X is the only interrupt mode for EF10 VFs

2017-02-14 12:43:18 -05:00

sriov.c

sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV

2017-01-10 14:16:17 -05:00

sriov.h

sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV

2017-01-10 14:16:17 -05:00

tx_tso.c

sfc: remove EFX_BUG_ON_PARANOID, use EFX_WARN_ON_[ONCE_]PARANOID instead

2016-12-03 16:11:00 -05:00

tx.c

mqprio: Modify mqprio to pass user parameters via ndo_setup_tc.

2017-03-15 15:20:27 -07:00

tx.h

sfc: Firmware-Assisted TSO version 2

2016-11-18 11:55:38 -05:00

vfdi.h

ethernet: codespell comment spelling fixes

2015-03-08 22:54:22 -04:00

workarounds.h

sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver

2016-11-30 10:16:58 -05:00