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
..
core	RDMA v5.14 merge window Pull Request	2021-07-01 14:54:03 -07:00
hw	RDMA/irdma: Change returned type of irdma_setup_virt_qp to void	2021-07-15 15:14:11 -03:00
sw	RDMA/rxe: Fix memory leak in error path code	2021-07-15 14:44:12 -03:00
ulp	dev_ioctl: split out ndo_eth_ioctl	2021-07-27 20:11:45 +01:00
Kconfig	RDMA/irdma: Add irdma Kconfig/Makefile and remove i40iw	2021-06-02 20:06:36 -03:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00