git.ipfire.org Git - thirdparty/kernel/linux.git/commit

]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit

projects / thirdparty / kernel / linux.git / commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 20 Nov 2025 17:12:41 +0000 (09:12 -0800)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 20 Nov 2025 17:13:26 +0000 (09:13 -0800)
commit	9e203721ec6117b2f4436a26662413764fd669f0
tree	48895ecf4aa8b80ca78bfc12940e65117574b6e9	tree \| snapshot
parent	0888a0d76dc20207ed0e7e22aa0f6ad97db90ca5	commit \| diff
parent	8e621c9a337555c914cf1664605edfaa6f839774	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.18-rc7).

No conflicts, adjacent changes:

tools/testing/selftests/net/af_unix/Makefile
e1bb28bf13f4 ("selftest: af_unix: Add test for SO_PEEK_OFF.")
45a1cd8346ca ("selftests: af_unix: Add tests for ECONNRESET and EOF semantics")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

21 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/airoha/airoha_ppe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/veth.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/helpers.c	diff1 \|	diff2 \|	blob \| history
net/core/dev_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_kernel.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/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/af_vsock.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/config	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/.gitignore	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/af_unix/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_join.sh	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/airoha/airoha_ppe.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ptp.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/idpf/idpf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phylink.c	diff1 \|	diff2 \|	blob \| history
drivers/net/veth.c	diff1 \|	diff2 \|	blob \| history
include/linux/filter.h	diff1 \|	diff2 \|	blob \| history
kernel/bpf/helpers.c	diff1 \|	diff2 \|	blob \| history
net/core/dev_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_core.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_kernel.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/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/vmw_vsock/af_vsock.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/config	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/.gitignore	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/af_unix/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_join.sh	diff1 \|	diff2 \|	blob \| history