OpenCloudOS-Kernel/drivers/net/dsa/microchip
David S. Miller d96ff269a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.

In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.

The aquantia driver conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-06-27 21:06:39 -07:00
..
Kconfig net: dsa: microchip: Initial SPI regmap support 2019-06-27 11:00:31 -07:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
ksz9477.c net: dsa: microchip: Replace bit RMW with regmap 2019-06-27 19:25:02 -07:00
ksz9477_reg.h net: dsa: microchip: rename ksz_9477_reg.h to ksz9477_reg.h 2018-11-20 20:57:12 -08:00
ksz9477_spi.c net: dsa: microchip: Factor out regmap config generation into common header 2019-06-27 11:00:32 -07:00
ksz_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-27 21:06:39 -07:00
ksz_common.h net: dsa: microchip: Replace ad-hoc polling with regmap 2019-06-27 19:25:02 -07:00
ksz_priv.h net: dsa: microchip: Dispose of ksz_io_ops 2019-06-27 11:00:31 -07:00