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
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
diag.c	net: Use nlmsg_unicast() instead of netlink_unicast()	2021-07-13 09:28:29 -07:00
garbage.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 62	2019-05-24 17:36:46 +02:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	af_unix: Implement ->psock_update_sk_prot()	2021-07-15 18:17:50 -07:00
scm.c	io_uring: move io_uring_get_socket() into io_uring.h	2020-09-30 20:32:33 -06:00
scm.h	net: split out functions related to registering inflight socket files	2019-02-28 08:24:23 -07:00
sysctl_net_unix.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
unix_bpf.c	af_unix: Implement unix_dgram_bpf_recvmsg()	2021-07-15 18:17:50 -07:00