projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0fb848d 6714ebb)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 22 Feb 2024 23:24:56 +0000 (15:24 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Feb 2024 23:29:26 +0000 (15:29 -0800)
commitfecc51559a844b7f74119159c3cdb25b80b4e2c6
tree2cf1e49810eb0c58e552f722cc2ab2742e62cf43tree | snapshot
parent0fb848d1a41e0d3895cb157810862db6046063ddcommit | diff
parent6714ebb922ab15a209dfc3c1ed29d4bb0abc9f02commit | diff
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/udp.c
  f796feabb9f5 ("udp: add local "peek offset enabled" flag")
  56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)")

Adjacent changes:

net/unix/garbage.c
  aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.")
  11498715f266 ("af_unix: Remove io_uring code for GC.")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
27 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/media/rc/bpf-lirc.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c diff1 | diff2 | blob | history
drivers/net/gtp.c diff1 | diff2 | blob | history
drivers/net/phy/realtek.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
kernel/bpf/helpers.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/iucv/iucv.c diff1 | diff2 | blob | history
net/mctp/route.c diff1 | diff2 | blob | history
net/mptcp/pm_netlink.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/mptcp/protocol.h diff1 | diff2 | blob | history
net/mptcp/subflow.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/sched/act_mirred.c diff1 | diff2 | blob | history
net/sched/cls_flower.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
net/unix/garbage.c diff1 | diff2 | blob | history
security/security.c diff1 | diff2 | blob | history
tools/testing/selftests/drivers/net/bonding/bond_options.sh diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git