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, 18 Sep 2025 18:23:29 +0000 (11:23 -0700)
committer	Jakub Kicinski <kuba@kernel.org>
	Thu, 18 Sep 2025 18:26:06 +0000 (11:26 -0700)
commit	f2cdc4c22bca57ab4cdb28ef4a02c53837d26fe0
tree	fc37acb6af7418250e8cc5097f5dd2d81d5cd1a1	tree \| snapshot
parent	1d9770838dcbe25151a319c1eae0c9879385b49f	commit \| diff
parent	cbf658dd09419f1ef9de11b9604e950bdd5c170b	commit \| diff

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

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

No conflicts.

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
9536fbe10c9d ("net/mlx5e: Add PSP steering in local NIC RX")
7601a0a46216 ("net/mlx5e: Add a miss level for ipsec crypto offload")

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

22 files changed:

Documentation/netlink/specs/conntrack.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/common.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ao.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_netlink.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_sockopt.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/tls.c	diff1 \|	diff2 \|	blob \| history

A mirror of Linus' kernel repository

RSS Atom

Documentation/netlink/specs/conntrack.yaml	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/driver.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ethtool/common.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ao.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/pm_netlink.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/protocol.c	diff1 \|	diff2 \|	blob \| history
net/mptcp/subflow.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/mptcp/mptcp_sockopt.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/net/tls.c	diff1 \|	diff2 \|	blob \| history