kernel: bump 5.4 to 5.4.277 (#12191)

This commit is contained in:
Beginner 2024-05-26 20:30:07 +08:00 committed by GitHub
parent d57b79961b
commit 86b8e436b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .276
LINUX_KERNEL_HASH-5.4.276 = e2712ebd4421ffa5b25a366659ecfbe1b45a444027ee2fe57369676453e86e07
LINUX_VERSION-5.4 = .277
LINUX_KERNEL_HASH-5.4.277 = 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51

View File

@ -1833,7 +1833,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -3467,10 +3467,11 @@ static int bcmgenet_probe(struct platfor
@@ -3478,10 +3478,11 @@ static int bcmgenet_probe(struct platfor
const struct of_device_id *of_id = NULL;
struct bcmgenet_priv *priv;
struct net_device *dev;
@ -1846,7 +1846,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Up to GENET_MAX_MQ_CNT + 1 TX queues and RX queues */
dev = alloc_etherdev_mqs(sizeof(*priv), GENET_MAX_MQ_CNT + 1,
@@ -3497,14 +3498,15 @@ static int bcmgenet_probe(struct platfor
@@ -3508,14 +3509,15 @@ static int bcmgenet_probe(struct platfor
}
if (dn) {
@ -1865,7 +1865,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
priv->base = devm_platform_ioremap_resource(pdev, 0);
@@ -3517,7 +3519,6 @@ static int bcmgenet_probe(struct platfor
@@ -3529,7 +3531,6 @@ static int bcmgenet_probe(struct platfor
SET_NETDEV_DEV(dev, &pdev->dev);
dev_set_drvdata(&pdev->dev, dev);