]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
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)
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:
1  2 
MAINTAINERS
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/ethernet/aeroflex/greth.c
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/renesas/ravb_main.c
drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
drivers/net/mdio/mdio-bcm-unimac.c
include/net/genetlink.h
net/ipv4/devinet.c
net/ipv4/inet_connection_sock.c
net/ipv4/udp.c
net/netlink/genetlink.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge