David S. Miller 3313da8188 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The netfilter conflicts were rather simple overlapping changes. However, the cls_tcindex.c stuff was a bit more complex. On the 'net' side, Cong is fixing several races and memory leaks. Whilst on the 'net-next' side we have Vlad adding the rtnl-ness support. What I've decided to do, in order to resolve this, is revert the conversion over to using a workqueue that Cong did, bringing us back to pure RCU. I did it this way because I believe that either Cong's races don't apply with have Vlad did things, or Cong will have to implement the race fix slightly differently. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-15 12:38:38 -08:00
..
falcon	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
Kconfig	ethernet: sfc: Add Kconfig entry for vendor Solarflare	2016-12-20 14:19:38 -05:00
Makefile	net: ethernet: sfc: Make subdir logic consistent with other vendors	2018-07-05 20:05:54 +09:00
bitfield.h	sfc: process RX event inner checksum flags	2017-02-09 16:47:53 -05:00
ef10.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-02-15 12:38:38 -08:00
ef10_regs.h	sfc: update EF10 register definitions	2017-12-18 13:07:50 -05:00
ef10_sriov.c	sfc: remove redundant variable old_vlan	2018-07-04 22:39:11 +09:00
ef10_sriov.h	sfc: support ndo_get_phys_port_id even when !CONFIG_SFC_SRIOV	2017-01-10 14:16:17 -05:00
efx.c	sfc: ensure recovery after allocation failures	2019-02-14 12:47:16 -05:00
efx.h	sfc: ARFS filter IDs	2018-04-24 13:48:22 -04:00
enum.h	sfc: remove RESET_TYPE_RX_RECOVERY	2016-12-01 15:39:38 -05:00
ethtool.c	net: core: dev: Add extack argument to dev_open()	2018-12-06 13:26:06 -08:00
farch.c	sfc: correctly initialise filter rwsem for farch	2018-06-30 21:13:37 +09:00
farch_regs.h	…
filter.h	sfc: support RSS spreading of ethtool ntuple filters	2018-03-08 21:54:52 -05:00
io.h	sfc: support VI strides other than 8k	2017-12-18 13:07:49 -05:00
mcdi.c	sfc: extend MTD support for newer hardware	2019-01-17 12:10:14 -08:00
mcdi.h	sfc: support VI strides other than 8k	2017-12-18 13:07:49 -05:00
mcdi_mon.c	ethernet: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
mcdi_pcol.h	sfc: add bundle partition definitions to mtd	2019-02-08 11:41:21 -08:00
mcdi_port.c	sfc: support FEC configuration through ethtool	2018-03-14 13:12:15 -04:00
mtd.c	sfc: extend MTD support for newer hardware	2019-01-17 12:10:14 -08:00
net_driver.h	sfc: batch up RX delivery	2018-07-04 14:06:19 +09:00
nic.c	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
nic.h	sfc: remove ctpio_dmabuf_start from stats	2018-04-04 12:07:22 -04:00
ptp.c	sfc: mark some unexported symbols as static	2018-01-28 21:59:18 -05:00
rx.c	sfc: ensure recovery after allocation failures	2019-02-14 12:47:16 -05:00
selftest.c	networking: make skb_put & friends return void pointers	2017-06-16 11:48:39 -04:00
selftest.h	…
siena.c	sfc: replace asynchronous filter operations	2018-03-27 13:33:19 -04:00
siena_sriov.c	…
siena_sriov.h	…
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.c	sfc: Replace dev_kfree_skb_any by dev_consume_skb_any	2019-02-14 12:26:50 -05:00
tx.h	sfc: Firmware-Assisted TSO version 2	2016-11-18 11:55:38 -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
vfdi.h	…
workarounds.h	sfc: tx ring can only have 2048 entries for all EF10 NICs	2017-04-25 11:19:21 -04:00