linux-stable/net/ncsi
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
..
internal.h ncsi: internal.h: Fix a spello 2021-03-28 17:31:13 -07:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00
ncsi-aen.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152 2019-05-30 11:26:32 -07:00
ncsi-cmd.c net/ncsi: Send device address as source address 2020-01-08 13:09:18 -08:00
ncsi-manage.c net/ncsi: Avoid channel_monitor hrtimer deadlock 2021-03-30 13:16:23 -07:00
ncsi-netlink.c net/ncsi: Fix netlink registration 2020-11-12 17:00:13 -08:00
ncsi-netlink.h net/ncsi: Fix netlink registration 2020-11-12 17:00:13 -08:00
ncsi-pkt.h net/ncsi: add response handlers for PLDM over NC-SI 2019-08-31 23:54:03 -07:00
ncsi-rsp.c net/ncsi: Use real net-device for response handler 2020-12-23 12:22:23 -08:00