Jakub Kicinski d2e11fd2b7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicting commits, all resolutions pretty trivial: drivers/bus/mhi/pci_generic.c 5c2c853159 ("bus: mhi: pci-generic: configurable network interface MRU") 56f6f4c4eb ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean") drivers/nfc/s3fwrn5/firmware.c a0302ff590 ("nfc: s3fwrn5: remove unnecessary label") 46573e3ab0 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") 801e541c79 ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") MAINTAINERS 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") 8a7b46fa79 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-07-31 09:14:46 -07:00
..
chip.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
chip.h	net: dsa: mv88e6xxx: Export cross-chip PVT as devlink region	2021-04-21 10:25:09 -07:00
devlink.c	net: dsa: mv88e6xxx: Export cross-chip PVT as devlink region	2021-04-21 10:25:09 -07:00
devlink.h	net: dsa: mv88e6xxx: Implement devlink info get callback	2020-09-18 18:18:30 -07:00
global1_atu.c	net: mv88e6xxx: convert comma to semicolon	2020-12-09 16:23:08 -08:00
global1_vtu.c	net: dsa: mv88e6xxx: use mv88e6185_g1_vtu_loadpurge() for the 6250	2021-01-26 17:58:28 -08:00
global1.c	net: dsa: mv88e6xxx: wrap .set_egress_port method	2021-03-17 14:44:18 -07:00
global1.h	net: dsa: mv88e6xxx: add support for mv88e6393x family	2021-03-17 14:44:18 -07:00
global2_avb.c
global2_scratch.c	net: dsa: mv88e6xxx: fix up kerneldoc some more	2021-03-22 13:09:02 -07:00
global2.c	net: dsa: mv88e6xxx: Export cross-chip PVT as devlink region	2021-04-21 10:25:09 -07:00
global2.h	net: dsa: mv88e6xxx: Export cross-chip PVT as devlink region	2021-04-21 10:25:09 -07:00
hwtstamp.c	net: dsa: no longer clone skb in core driver	2021-04-27 14:10:15 -07:00
hwtstamp.h	net: dsa: no longer clone skb in core driver	2021-04-27 14:10:15 -07:00
Kconfig	net: dsa: mv88e6xxx: NET_DSA_MV88E6XXX_PTP should depend on NET_DSA_MV88E6XXX	2021-07-15 10:04:43 -07:00
Makefile	net: dsa: mv88e6xxx: Make global2 support mandatory	2021-01-27 19:28:16 -08:00
phy.c
phy.h
port_hidden.c
port.c	net: dsa: mv88e6xxx: Offload bridge learning flag	2021-03-18 16:24:06 -07:00
port.h	net: dsa: mv88e6xxx: Offload bridge learning flag	2021-03-18 16:24:06 -07:00
ptp.c
ptp.h
serdes.c	net: dsa: mv88e6xxx: enable SerDes RX stats for Topaz	2021-07-01 11:51:36 -07:00
serdes.h	net: dsa: mv88e6xxx: add support for mv88e6393x family	2021-03-17 14:44:18 -07:00
smi.c
smi.h