David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ...

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

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

2018-07-20 21:17:12 -07:00

..

falcon

treewide: Use array_size() in vzalloc()

2018-06-12 16:19:22 -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

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

ef10.c

sfc: avoid hang from nested use of the filter_sem

2018-07-12 14:52:04 -07:00

efx.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07: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

sfc: fix flow type handling for RSS filters

2018-03-27 13:33:20 -04:00

farch_regs.h

…

farch.c

sfc: correctly initialise filter rwsem for farch

2018-06-30 21:13:37 +09:00

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

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

mcdi_mon.c

ethernet: Use octal not symbolic permissions

2018-03-26 12:07:49 -04:00

mcdi_pcol.h

sfc: update MCDI protocol headers

2018-03-14 13:12:14 -04:00

mcdi_port.c

sfc: support FEC configuration through ethtool

2018-03-14 13:12:15 -04:00

mcdi.c

jiffies: Introduce USER_TICK_USEC and redefine TICK_USEC

2018-04-06 09:28:50 +02:00

mcdi.h

sfc: support VI strides other than 8k

2017-12-18 13:07:49 -05:00

mtd.c

mtd: Stop updating erase_info->state and calling mtd_erase_callback()

2018-03-21 09:50:56 +01:00

net_driver.h

sfc: batch up RX delivery

2018-07-04 14:06:19 +09:00

nic.c

…

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: batch up RX delivery

2018-07-04 14:06:19 +09:00

selftest.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04:00

selftest.h

…

siena_sriov.c

…

siena_sriov.h

…

siena.c

sfc: replace asynchronous filter operations

2018-03-27 13:33:19 -04: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

sfc: stop the TX queue before pushing new buffers

2018-05-25 14:49:37 -04:00

tx.h

sfc: Firmware-Assisted TSO version 2

2016-11-18 11:55:38 -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