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
..
e1000	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
e1000e	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
fm10k	fm10k: Fix an error handling path in 'fm10k_probe()'	2021-07-01 10:59:21 -07:00
i40e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
iavf	iavf: fix locking of critical sections	2021-07-19 09:18:30 -07:00
ice	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
igb	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
igbvf	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
igc	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
ixgb	intel: handle unused assignments	2020-09-25 16:28:59 -07:00
ixgbe	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
ixgbevf	ixgbevf: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops	2021-07-06 10:36:59 -07:00
Kconfig	Revert "igc: Export LEDs"	2021-07-20 13:53:59 +02:00
Makefile	…
e100.c	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00