]> www.infradead.org Git - users/willy/xarray.git/commit
projects / users / willy / xarray.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: a6a9fcb 51df8e0)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 11 Jul 2024 19:57:57 +0000 (12:57 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 11 Jul 2024 19:58:13 +0000 (12:58 -0700)
commit7c8267275de6989a9b682a07d75e89395457ee01
treedb28c44520d9f786a4142871b42eb80f0d205dddtree
parenta6a9fcb10836105e525ccb8bc1a6af4b20a113becommit | diff
parent51df8e0cbaefd432f7029dde94e6c7e4e5b19465commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/sched/act_ct.c
  26488172b029 ("net/sched: Fix UAF when resolving a clash")
  3abbd7ed8b76 ("act_ct: prepare for stolen verdict coming from conntrack and nat engine")

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/af/rvu.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/bpf/helpers.c diff1 | diff2 | blob | history
net/core/datagram.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_timer.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/sched/act_ct.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/config diff1 | diff2 | blob | history
XArray, radix tree and IDR