OpenCloudOS-Kernel/drivers/net/dsa/microchip
Jakub Kicinski 2295cddf99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-10-15 12:43:21 -07:00
..
Kconfig net: dsa: ksz: Select KSZ protocol tag 2020-03-31 10:04:40 -07:00
Makefile net: dsa: microchip: add KSZ9477 I2C driver 2019-09-12 11:36:12 +01:00
ksz8795.c net: dsa: propagate switchdev vlan_filtering prepare phase to drivers 2020-10-05 05:56:48 -07:00
ksz8795_reg.h net: dsa: ksz: Add Microchip KSZ8795 DSA driver 2019-07-30 15:12:50 -07:00
ksz8795_spi.c net: dsa: microchip: Add shared regmap mutex 2019-10-17 15:38:46 -04:00
ksz9477.c net: dsa: propagate switchdev vlan_filtering prepare phase to drivers 2020-10-05 05:56:48 -07:00
ksz9477_i2c.c net: dsa: microchip: add ksz9563 to ksz9477 I2C driver 2020-10-09 13:05:56 -07:00
ksz9477_reg.h net: dsa: microchip: Use the correct style for SPDX License Identifier 2019-10-15 14:59:58 -07:00
ksz9477_spi.c net: dsa: microchip: enable module autoprobe 2020-02-07 18:45:12 +01:00
ksz_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-10-15 12:43:21 -07:00
ksz_common.h net: dsa: microchip: look for phy-mode in port nodes 2020-09-10 12:32:37 -07:00