git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

author	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Jun 2024 20:13:38 +0000 (13:13 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 13 Jun 2024 20:13:46 +0000 (13:13 -0700)
commit	4c7d3d79c736186bb2585f2d0a8231e1fac839da
tree	5abd973d57d360e24c9df2f17e942176ab2faaa5	tree \| snapshot
parent	3ec8d7572a69d142d49f52b28ce8d84e5fef9131	commit \| diff
parent	d20f6b3d747c36889b7ce75ee369182af3decb6b	commit \| diff

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

Cross-merge networking fixes after downstream PR.

No conflicts, no adjacent changes.

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

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/pensando/ionic/ionic_lif.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c	diff1 \|	diff2 \|	blob \| history
include/net/ip_tunnels.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_generic.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history