The patch below does not apply to the 4.19-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y git checkout FETCH_HEAD git cherry-pick -x 6807352353561187a718e87204458999dbcbba1b # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024072923-veteran-backless-4326@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^.. Possible dependencies: 680735235356 ("ipv4: fix source address selection with route leak") eba618abacad ("ipv4: Add fib_nh_common to fib_result") 0af7e7c128eb ("ipv4: Update fib_table_lookup tracepoint to take common nexthop") b75ed8b1aa9c ("ipv4: Rename fib_nh entries") faa041a40b9f ("ipv4: Create cleanup helper for fib_nh") e4516ef65490 ("ipv4: Create init helper for fib_nh") 331c7a402358 ("ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper") 8373c6c84e67 ("ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled") 544fe7c2e654 ("net/mlx5e: Activate HW multipath and handle port affinity based on FIB events") 724b509ca023 ("net/mlx5: Add multipath mode") 10a193ed78ad ("net/mlx5: Expose lag operations in header file") bb19ad0d8d49 ("net/mlx5: Use unsigned int bit instead of bool as a struct member") 97417f6182f8 ("net/mlx5e: Fix GRE key by controlling port tunnel entropy calculation") d9ee0491c2ff ("net/mlx5e: Use dedicated uplink vport netdev representor") 025380b20dc2 ("net/mlx5e: Use single argument for the esw representor build params helper") 958246664043 ("net/mlx5: Handle LAG FW commands failure gracefully") 7c34ec19e10c ("net/mlx5: Make RoCE and SR-IOV LAG modes explicit") 292612d68c4e ("net/mlx5: Rename mlx5_lag_is_bonded() to __mlx5_lag_is_active()") eff849b2c669 ("net/mlx5: Allow/disallow LAG according to pre-req only") 3b5ff59fd851 ("net/mlx5: Adjustments for the activate LAG logic to run under sriov") thanks, greg k-h ------------------ original commit in Linus's tree ------------------