Bacport hulk patches
Dong Chenchen (1):
net: xfrm: skip policies marked as dead while reinserting policies
Lu Wei (4):
netfilter: make return-type and function-name in the same line
bpf: fix magic numbers in bpf_get_sockops_uid_gid()
bpf: socketmap: add Kconfig for customized socketmap
tcp_comp: modify default value of TCP_COMP to n
Ziyang Xuan (2):
bpf: fix format type mismatch warning
bpf: fix type incompatible warning
arch/arm64/configs/openeuler_defconfig | 1 +
arch/x86/configs/openeuler_defconfig | 1 +
include/net/netfilter/nf_conntrack.h | 2 ++
include/net/sock.h | 6 +++++-
net/Kconfig | 10 ++++++++++
net/core/filter.c | 11 ++++++++++-
net/core/sock.c | 4 ++++
net/ipv4/Kconfig | 1 +
net/netfilter/nf_conntrack_proto.c | 16 +++++++++++-----
net/socket.c | 2 ++
net/xfrm/xfrm_policy.c | 13 +++++++++----
11 files changed, 56 insertions(+), 11 deletions(-)
--
2.25.1