From: Paolo Abeni Date: Mon, 21 Oct 2024 07:14:18 +0000 (+0200) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=91afa49a3eda8ebf902ce68f02cb16b48c879b6a;p=users%2Fjedix%2Flinux-maple.git 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 --- 91afa49a3eda8ebf902ce68f02cb16b48c879b6a