Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

No conflicts.

Adjacent changes:

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
  35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
  2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/netlink/specs/rt_link.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hnae3.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 85b5d2331fc956870cc6801ed908cbfbbf2ab12d,ce60332d83c39cbe5f6e60a51f6cd9b61b69333f..43cc6ee4d87db087afcf0c56685243bf02a9ae70
--- 1/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
--- 2/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@@ -11699,16 -11634,9 +11708,10 @@@ static int hclge_init_ae_dev(struct hna
        /* Firmware command queue initialize */
        ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);
        if (ret)
-               goto err_devlink_uninit;
+               goto err_pci_uninit;
  
        /* Firmware command initialize */
 +      hclge_comm_cmd_init_ops(&hdev->hw.hw, &hclge_cmq_ops);
        ret = hclge_comm_cmd_init(hdev->ae_dev, &hdev->hw.hw, &hdev->fw_version,
                                  true, hdev->reset_pending);
        if (ret)

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/linux/slab.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc include/uapi/linux/xfrm.h
Simple merge

diff --cc kernel/trace/trace_probe.c
Simple merge

diff --cc net/core/net_namespace.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/hsr/hsr_device.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/ipv4/xfrm4_input.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/xfrm6_input.c
Simple merge

diff --cc net/mptcp/ctrl.c
Simple merge

diff --cc net/phonet/pn_netlink.c
Simple merge

diff --cc net/xfrm/xfrm_input.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge