Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Jun 2023 18:34:28 +0000 (11:34 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Jun 2023 18:35:14 +0000 (11:35 -0700)
commit449f6bc17a51e68b06cfd742898e5ff3fe6e04d7
treeed59929e7d1fa057ac6998075986a4cdfb85eb5a
parentbfd019d10fdabf70f9b01264aea6d6c7595f9226
parent25041a4c02c7cf774d8b6ed60586fd64f1cdaa81
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/sch_taprio.c
  d636fc5dd692 ("net: sched: add rcu annotations around qdisc->qdisc_sleeping")
  dced11ef84fb ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()")

net/ipv4/sysctl_net_ipv4.c
  e209fee4118f ("net/ipv4: ping_group_range: allow GID from 2147483648 to 4294967294")
  ccce324dabfe ("tcp: make the first N SYN RTO backoffs linear")
https://lore.kernel.org/all/20230605100816.08d41a7b@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
26 files changed:
Documentation/networking/ip-sysctl.rst
MAINTAINERS
drivers/net/dsa/lan9303-core.c
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/freescale/enetc/enetc.c
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
drivers/net/phy/phylink.c
drivers/net/virtio_net.c
drivers/net/wireless/realtek/rtw88/mac80211.c
drivers/net/wireless/realtek/rtw89/core.c
drivers/net/wireless/realtek/rtw89/mac80211.c
include/net/pkt_sched.h
include/uapi/linux/bpf.h
kernel/bpf/syscall.c
kernel/trace/bpf_trace.c
net/core/dev.c
net/ipv4/sysctl_net_ipv4.c
net/ipv4/tcp_offload.c
net/ipv6/exthdrs.c
net/mptcp/pm.c
net/netfilter/nf_tables_api.c
net/sched/sch_taprio.c
tools/include/uapi/linux/bpf.h
tools/lib/bpf/libbpf.c
tools/lib/bpf/libbpf_probes.c
tools/testing/selftests/net/mptcp/mptcp_join.sh