linux-stable/drivers/net/ethernet/sfc
David S. Miller 9f6e055907 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The mptcp conflict was overlapping additions.

The SMC conflict was an additional and removal happening at the same
time.

Signed-off-by: David S. Miller <davem@davemloft.net>
2020-02-27 18:31:39 -08:00
..
falcon sfc: Replace zero-length array with flexible-array member 2020-02-26 16:43:09 -08:00
Kconfig sfc: Remove unnecessary dependencies on I2C 2020-01-02 16:23:18 -08:00
Makefile sfc: move mcdi filtering code 2020-01-27 13:05:43 +01:00
bitfield.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ef10.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2020-01-28 16:02:33 -08:00
ef10_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ef10_sriov.c sfc: avoid duplicate error handling code in 'efx_ef10_sriov_set_vf_mac()' 2019-12-30 17:52:21 -08:00
ef10_sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
efx.c sfc: remove unused variable 'efx_default_channel_type' 2020-02-19 16:26:02 -08:00
efx.h sfc: move some ARFS code out of headers 2020-02-17 14:35:23 -08:00
efx_channels.c sfc: move some ARFS code out of headers 2020-02-17 14:35:23 -08:00
efx_channels.h sfc: add new headers in preparation for code split 2020-01-08 13:28:02 -08:00
efx_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 2020-01-28 16:02:33 -08:00
efx_common.h sfc: move yet more functions 2020-01-10 11:24:37 -08:00
enum.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ethtool.c sfc: move RPS code 2020-01-10 11:24:37 -08:00
ethtool_common.c sfc/ethtool_common: Make some function to static 2020-01-13 06:00:43 -08:00
ethtool_common.h sfc: move some ethtool code 2020-01-10 11:24:37 -08:00
farch.c sfc: add new headers in preparation for code split 2020-01-08 13:28:02 -08:00
farch_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
filter.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
io.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mcdi.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mcdi.h sfc: move various functions 2020-01-10 11:24:37 -08:00
mcdi_filters.c sfc: move mcdi filtering code 2020-01-27 13:05:43 +01:00
mcdi_filters.h sfc: create header for mcdi filtering code 2020-01-27 13:05:43 +01:00
mcdi_functions.c sfc: remove set but not used variable 'nic_data' 2020-01-10 23:15:28 -08:00
mcdi_functions.h sfc: move yet more functions 2020-01-10 11:24:37 -08:00
mcdi_mon.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mcdi_pcol.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
mcdi_port.c sfc: move a couple more functions 2020-01-10 11:24:37 -08:00
mcdi_port_common.c sfc: move a couple more functions 2020-01-10 11:24:37 -08:00
mcdi_port_common.h sfc: move a couple more functions 2020-01-10 11:24:37 -08:00
mtd.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
net_driver.h sfc: Replace zero-length array with flexible-array member 2020-02-26 16:43:09 -08:00
nic.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
nic.h sfc: add new headers in preparation for code split 2020-01-08 13:28:02 -08:00
ptp.c sfc: fix timestamp reconstruction at 16-bit rollover points 2020-02-27 12:04:49 -08:00
rx.c sfc: move RPS code 2020-01-10 11:24:37 -08:00
rx_common.c sfc: move RPS code 2020-01-10 11:24:37 -08:00
rx_common.h sfc: move RPS code 2020-01-10 11:24:37 -08:00
selftest.c sfc: refactor selftest work init code 2020-01-10 11:24:37 -08:00
selftest.h sfc: refactor selftest work init code 2020-01-10 11:24:37 -08:00
siena.c sfc: move various functions 2020-01-10 11:24:37 -08:00
siena_sriov.c sfc: move channel alloc/removal code 2020-01-08 13:28:03 -08:00
siena_sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sriov.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
sriov.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
tx.c sfc: elide assignment of skb 2020-02-18 12:40:49 -08:00
tx.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
tx_common.c sfc: move a couple more functions 2020-01-10 11:24:37 -08:00
tx_common.h sfc: move a couple more functions 2020-01-10 11:24:37 -08:00
tx_tso.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
vfdi.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
workarounds.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00