linux-stable/net/hsr
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
..
hsr_debugfs.c /net/hsr: fix misspellings using codespell tool 2021-03-18 19:13:41 -07:00
hsr_device.c net: hsr: Reset MAC header for Tx path 2021-04-07 14:25:12 -07:00
hsr_device.h net: hsr: add offloading support 2021-02-11 13:24:44 -08:00
hsr_forward.c net: hsr: Reset MAC header for Tx path 2021-04-07 14:25:12 -07:00
hsr_forward.h net: hsr: add offloading support 2021-02-11 13:24:44 -08:00
hsr_framereg.c net: hsr: add support for EntryForgetTime 2021-02-25 09:41:51 -08:00
hsr_framereg.h net: hsr: add support for EntryForgetTime 2021-02-25 09:41:51 -08:00
hsr_main.c net: hsr: add offloading support 2021-02-11 13:24:44 -08:00
hsr_main.h net: hsr: add support for EntryForgetTime 2021-02-25 09:41:51 -08:00
hsr_netlink.c genetlink: move to smaller ops wherever possible 2020-10-02 19:11:11 -07:00
hsr_netlink.h hsr: enhance netlink socket interface to support PRP 2020-07-27 12:20:40 -07:00
hsr_slave.c net: hsr: add offloading support 2021-02-11 13:24:44 -08:00
hsr_slave.h net: prp: add packet handling support 2020-07-27 12:20:40 -07:00
Kconfig hsr: enhance netlink socket interface to support PRP 2020-07-27 12:20:40 -07:00
Makefile treewide: Add SPDX license identifier - Makefile/Kconfig 2019-05-21 10:50:46 +02:00