Merge branch 'next/drivers' into for-next

joyxu · joyxu · commit 6c177775dcc5 · 2025-08-28T11:57:48.000Z
Signed-off-by: Wei Xu &lt;xuwei5@hisilicon.com&gt;
diff --git a/drivers/soc/hisilicon/kunpeng_hccs.c b/drivers/soc/hisilicon/kunpeng_hccs.c
@@ -1464,7 +1464,7 @@ static ssize_t dec_lane_of_type_store(struct kobject *kobj, struct kobj_attribut
 		goto out;
 	if (!all_in_idle) {
 		ret = -EBUSY;
-		dev_err(hdev->dev, "please don't decrese lanes on high load with %s, ret = %d.\n",
+		dev_err(hdev->dev, "please don't decrease lanes on high load with %s, ret = %d.\n",
 			hccs_port_type_to_name(hdev, port_type), ret);
 		goto out;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1464,7 +1464,7 @@ static ssize_t dec_lane_of_type_store(struct kobject *kobj, struct kobj_attribut`
`1464`	`1464`	`goto out;`
`1465`	`1465`	`if (!all_in_idle) {`
`1466`	`1466`	`ret = -EBUSY;`
`1467`		`- dev_err(hdev->dev, "please don't decrese lanes on high load with %s, ret = %d.\n",`
	`1467`	`+ dev_err(hdev->dev, "please don't decrease lanes on high load with %s, ret = %d.\n",`
`1468`	`1468`	`hccs_port_type_to_name(hdev, port_type), ret);`
`1469`	`1469`	`goto out;`
`1470`	`1470`	`}`