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
..
bnx2x	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
bnxt	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
genet	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
b44.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
b44.h
bcm63xx_enet.c	bcm63xx_enet: delete a redundant assignment	2021-07-29 22:18:42 +01:00
bcm63xx_enet.h	bcm63xx_enet: convert to build_skb	2021-01-07 12:39:53 -08:00
bcm4908_enet.c	net: broadcom: bcm4908_enet: reset DMA rings sw indexes properly	2021-06-22 10:34:13 -07:00
bcm4908_enet.h	net: broadcom: rename BCM4908 driver & update DT binding	2021-02-11 15:04:17 -08:00
bcmsysport.c	of: net: pass the dst buffer to of_get_mac_address()	2021-04-13 14:35:02 -07:00
bcmsysport.h	net: broadcom: share header defining UniMAC registers	2021-01-08 19:17:28 -08:00
bgmac-bcma-mdio.c
bgmac-bcma.c	of: net: pass the dst buffer to of_get_mac_address()	2021-04-13 14:35:02 -07:00
bgmac-platform.c	net: ethernet: bgmac: Use devm_platform_ioremap_resource_byname	2021-06-07 14:07:22 -07:00
bgmac.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
bgmac.h	net: broadcom: share header defining UniMAC registers	2021-01-08 19:17:28 -08:00
bnx2.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
bnx2.h
bnx2_fw.h
cnic.c	cnic: convert tasklets to use new tasklet_setup() API	2020-09-14 13:02:37 -07:00
cnic.h
cnic_defs.h	net: cnic: fix spelling mistake "reserverd" -> "reserved"	2020-02-17 21:59:16 -08:00
cnic_if.h
Kconfig	bnxt_en: Add PTP clock APIs, ioctls, and ethtool methods	2021-06-28 13:41:05 -07:00
Makefile	net: broadcom: rename BCM4908 driver & update DT binding	2021-02-11 15:04:17 -08:00
sb1250-mac.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
tg3.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
tg3.h	tg3: improve PCI VPD access	2021-01-25 15:24:19 -08:00
unimac.h	net: broadcom: share header defining UniMAC registers	2021-01-08 19:17:28 -08:00