]> www.infradead.org Git - users/dwmw2/linux.git/commit
projects / users / dwmw2 / linux.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 906c686 07d6bf6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorPaolo Abeni <pabeni@redhat.com>
Mon, 21 Oct 2024 07:14:18 +0000 (09:14 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Mon, 21 Oct 2024 07:14:18 +0000 (09:14 +0200)
commit91afa49a3eda8ebf902ce68f02cb16b48c879b6a
tree3ceca7290ee7358c8e647b27f992604ce9c7ec20tree
parent906c68657850796023a8b183d1ca681ebbd6ef98commit | diff
parent07d6bf634bc8f93caf8920c9d61df761645336e2commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.12-rc4).

Conflicts:

107a034d5c1e ("net/mlx5: qos: Store rate groups in a qos domain")
1da9cfd6c41c ("net/mlx5: Unregister notifier on eswitch init failure")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mv88e6xxx/chip.c diff1 | diff2 | blob | history
drivers/net/ethernet/aeroflex/greth.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mediatek/mtk_eth_soc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c diff1 | diff2 | blob | history
drivers/net/ethernet/xilinx/xilinx_axienet_main.c diff1 | diff2 | blob | history
drivers/net/mdio/mdio-bcm-unimac.c diff1 | diff2 | blob | history
include/net/genetlink.h diff1 | diff2 | blob | history
net/ipv4/devinet.c diff1 | diff2 | blob | history
net/ipv4/inet_connection_sock.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/netlink/genetlink.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.