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
..
addr.c	tipc: introduce new unified address type for internal use	2021-03-17 11:51:04 -07:00
addr.h	tipc: introduce new unified address type for internal use	2021-03-17 11:51:04 -07:00
bcast.c	net: tipc: fix FB_MTU eat two pages	2021-06-28 13:31:57 -07:00
bcast.h	tipc: update a binding service via broadcast	2020-06-17 08:53:34 -07:00
bearer.c	tipc: fix unique bearer names sanity check	2021-04-01 15:43:31 -07:00
bearer.h	net: tipc: Fix spelling errors in net/tipc module	2021-04-07 14:29:29 -07:00
core.c	tipc: simplify the finalize work queue	2021-05-18 13:22:09 -07:00
core.h	tipc: simplify the finalize work queue	2021-05-18 13:22:09 -07:00
crypto.c	tipc: do not write skb_shinfo frags when doing decrytion	2021-07-24 19:38:21 +01:00
crypto.h	net/tipc: fix tipc header files for kernel-doc	2020-12-01 15:37:41 -08:00
diag.c
discover.c	tipc: simplify the finalize work queue	2021-05-18 13:22:09 -07:00
discover.h
eth_media.c	tipc: Use is_broadcast_ether_addr() instead of memcmp()	2020-08-03 16:21:46 -07:00
group.c	tipc: update address terminology in code	2020-11-27 17:34:01 -08:00
group.h	tipc: update address terminology in code	2020-11-27 17:34:01 -08:00
ib_media.c	tipc: introduce variable window congestion control	2019-12-10 17:31:15 -08:00
Kconfig	tipc: not enable tipc when ipv6 works as a module	2020-08-16 21:04:55 -07:00
link.c	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
link.h	tipc: simplify the finalize work queue	2021-05-18 13:22:09 -07:00
Makefile	tipc: remove meaningless assignment in Makefile	2020-01-08 12:38:54 -08:00
monitor.c	tipc: clean up warnings detected by sparse	2021-03-11 18:06:54 -08:00
monitor.h
msg.c	net: tipc: replace align() with ALIGN in msg.c	2021-06-28 13:31:57 -07:00
msg.h	net: tipc: fix FB_MTU eat two pages	2021-06-28 13:31:57 -07:00
name_distr.c	tipc: remove some unnecessary warnings	2021-03-17 11:51:05 -07:00
name_distr.h	net/tipc: fix tipc header files for kernel-doc	2020-12-01 15:37:41 -08:00
name_table.c	tipc: simplify handling of lookup scope during multicast message reception	2021-06-03 14:06:39 -07:00
name_table.h	tipc: simplify handling of lookup scope during multicast message reception	2021-06-03 14:06:39 -07:00
net.c	tipc: simplify the finalize work queue	2021-05-18 13:22:09 -07:00
net.h	tipc: fix a deadlock when flushing scheduled work	2020-09-07 12:08:53 -07:00
netlink.c	tipc: add automatic rekeying for encryption key	2020-09-18 13:58:37 -07:00
netlink.h
netlink_compat.c	tipc: convert dest node's address to network order	2021-03-11 18:06:54 -08:00
node.c	node.c: fix the use of indefinite article	2021-06-10 13:47:13 -07:00
node.h	tipc: add automatic session key exchange	2020-09-18 13:58:37 -07:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-07-31 09:14:46 -07:00
socket.h	tipc: add stricter control of reserved service types	2020-10-30 08:19:18 -07:00
subscr.c	tipc:subscr.c: fix a spelling mistake	2021-06-10 13:48:43 -07:00
subscr.h	tipc: fix htmldoc and smatch warnings	2021-03-29 16:28:50 -07:00
sysctl.c	tipc: add automatic session key exchange	2020-09-18 13:58:37 -07:00
topsrv.c	tipc: update address terminology in code	2020-11-27 17:34:01 -08:00
topsrv.h
trace.c	net/tipc: fix various kernel-doc warnings	2020-12-01 15:37:46 -08:00
trace.h	tipc: add support for broadcast rcv stats dumping	2020-05-26 15:16:52 -07:00
udp_media.c	tipc: wait and exit until all work queues are done	2021-05-17 14:07:48 -07:00
udp_media.h