]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 3cfb5aa 5abfdfd)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 6 Sep 2024 03:27:09 +0000 (20:27 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 13 Sep 2024 00:11:24 +0000 (17:11 -0700)
commit46ae4d0a489741565520195bddebc3414781e603
treeb364bb2c6808d4d1ae4e00c46c123caf7fffe618tree
parent3cfb5aa10cb78571e214e48a3a6e42c11d5288a1commit | diff
parent5abfdfd402699ce7c1e81d1a25bc37f60f7741ffcommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts (sort of) and no adjacent changes.

This merge reverts commit b3c9e65eb227 ("net: hsr: remove seqnr_lock")
from net, as it was superseded by
commit 430d67bdcb04 ("net: hsr: Use the seqnr lock for frames received via interlink port.")
in net-next.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/ocelot/felix_vsc9959.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_lib.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/ice/ice_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/octeontx2/af/rvu.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/main.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
include/linux/mlx5/mlx5_ifc.h diff1 | diff2 | blob | history
net/hsr/hsr_device.c diff1 | diff2 | blob | history
net/mptcp/pm_netlink.c diff1 | diff2 | blob | history
net/netfilter/nft_socket.c diff1 | diff2 | blob | history
tools/testing/selftests/net/mptcp/mptcp_join.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.