1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 17:23:25 -05:00
linux/net/tipc
Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

MAINTAINERS
 - keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 - simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
 - trivial
include/linux/ethtool.h
 - trivial, fix kdoc while at it
include/linux/skmsg.h
 - move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
 - add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
 - trivial

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-04-09 20:48:35 -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
bcast.h
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
core.h
crypto.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-04-09 20:48:35 -07:00
crypto.h
diag.c
discover.c
discover.h
eth_media.c
group.c
group.h
ib_media.c
Kconfig
link.c
link.h
Makefile
monitor.c tipc: clean up warnings detected by sparse 2021-03-11 18:06:54 -08:00
monitor.h
msg.c tipc: refactor tipc_sendmsg() and tipc_lookup_anycast() 2021-03-17 11:51:04 -07:00
msg.h
name_distr.c tipc: remove some unnecessary warnings 2021-03-17 11:51:05 -07:00
name_distr.h
name_table.c tipc: Fix a kernel-doc warning in name_table.c 2021-04-05 12:51:34 -07:00
name_table.h tipc: simplify signature of tipc_find_service() 2021-03-17 11:51:05 -07:00
net.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-04-09 20:48:35 -07:00
net.h
netlink.c
netlink.h
netlink_compat.c tipc: convert dest node's address to network order 2021-03-11 18:06:54 -08:00
node.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-04-09 20:48:35 -07:00
node.h
socket.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2021-04-09 20:48:35 -07:00
socket.h
subscr.c tipc: add host-endian copy of user subscription to struct tipc_subscription 2021-03-17 11:51:05 -07:00
subscr.h tipc: fix htmldoc and smatch warnings 2021-03-29 16:28:50 -07:00
sysctl.c
topsrv.c
topsrv.h
trace.c
trace.h
udp_media.c mld: change lockdep annotation for ip6_sf_socklist and ipv6_mc_socklist 2021-04-05 12:50:04 -07:00
udp_media.h