]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 14 Jul 2022 21:19:42 +0000 (14:19 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Jul 2022 22:27:35 +0000 (15:27 -0700)
commit9bbe15b56ca2ebd781b9dce2a7ff2d6bf5341935
tree30cbcb7d5d4e1dd226fda651f25ca094e54714a0
parent6cf8aadfb6d6b6cb536ff7670cf961e3c5a76f89
parent9bf0c135d38d52ea3062b7ff88d0cc12d583e928
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

include/net/sock.h
  6ccc8b7ee602 ("net: Fix data-races around sysctl_mem.")
  76b50b3a78d6 ("Revert "net: set SK_MEM_QUANTUM to 4096"")
https://lore.kernel.org/all/20220711120211.7c8b7cba@canb.auug.org.au/

net/ipv4/fib_semantics.c
  7c0d80225cc9 ("ip: fix dflt addr selection for connected nexthop")
  e124aba2387b ("net: rename reference+tracking helpers")

net/tls/tls.h
include/net/tls.h
  ed00caf2bd5d ("net/tls: Check for errors in tls_device_init")
  3eeea972b5ce ("tls: create an internal header")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
47 files changed:
Documentation/networking/ip-sysctl.rst
MAINTAINERS
arch/x86/net/bpf_jit_comp.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
drivers/net/ethernet/netronome/nfp/nfdk/dp.c
drivers/net/ethernet/sfc/ef10.c
drivers/net/wireless/ath/ath11k/wmi.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/realtek/rtw88/rtw8821c.c
drivers/net/xen-netback/rx.c
include/net/cfg80211.h
include/net/mac80211.h
include/net/raw.h
include/net/sock.h
include/uapi/linux/bpf.h
kernel/bpf/core.c
kernel/bpf/helpers.c
kernel/sysctl.c
net/core/dev.c
net/core/filter.c
net/ipv4/af_inet.c
net/ipv4/fib_semantics.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv6/route.c
net/mac80211/cfg.c
net/mac80211/iface.c
net/mac80211/rx.c
net/mac80211/tx.c
net/mac80211/util.c
net/mac80211/wme.c
net/mptcp/protocol.c
net/tls/tls.h
net/tls/tls_device.c
net/tls/tls_main.c
net/wireless/sme.c
tools/include/uapi/linux/bpf.h
tools/testing/selftests/net/.gitignore
tools/testing/selftests/net/forwarding/Makefile