From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 9 May 2024 16:59:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7073830cc8b52ef3df7dd150e4dac7706e0e104;p=linux.git

Merge git://git./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>
---

e7073830cc8b52ef3df7dd150e4dac7706e0e104
diff --cc drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 85b5d2331fc95,ce60332d83c39..43cc6ee4d87db
--- a/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)