kernel: bump 5.10 to 5.10.155

All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2022-11-16 07:17:49 -05:00 committed by Hauke Mehrtens
parent 170f3d7b0a
commit 9e137bb10e
3 changed files with 9 additions and 9 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .154
LINUX_KERNEL_HASH-5.10.154 = c6ae3d4da4324933160260d0f092a40cd27f9ed03449380790afbe6ce91ee688
LINUX_VERSION-5.10 = .155
LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3

View File

@ -775,7 +775,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* bring up the dma engine and IP core */
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2700,7 +2700,6 @@ static int mv643xx_eth_shared_of_add_por
@@ -2701,7 +2701,6 @@ static int mv643xx_eth_shared_of_add_por
struct platform_device *ppdev;
struct mv643xx_eth_platform_data ppd;
struct resource res;
@ -783,7 +783,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int ret;
int dev_num = 0;
@@ -2731,9 +2730,7 @@ static int mv643xx_eth_shared_of_add_por
@@ -2732,9 +2731,7 @@ static int mv643xx_eth_shared_of_add_por
return -EINVAL;
}
@ -1250,7 +1250,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
@@ -372,7 +372,7 @@ static int meson8b_dwmac_probe(struct pl
@@ -370,7 +370,7 @@ static int meson8b_dwmac_probe(struct pl
if (ret)
return ret;
@ -1455,7 +1455,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
of_node_put(node);
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1306,7 +1306,6 @@ static int cpsw_probe_dt(struct cpsw_pla
@@ -1308,7 +1308,6 @@ static int cpsw_probe_dt(struct cpsw_pla
for_each_available_child_of_node(node, slave_node) {
struct cpsw_slave_data *slave_data = data->slave_data + i;
@ -1463,7 +1463,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int lenp;
const __be32 *parp;
@@ -1378,10 +1377,8 @@ static int cpsw_probe_dt(struct cpsw_pla
@@ -1380,10 +1379,8 @@ static int cpsw_probe_dt(struct cpsw_pla
}
no_phy_slave:

View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Align . to a 8 byte boundary equals to maximum function alignment. */
#define ALIGN_FUNCTION() . = ALIGN(8)
@@ -473,14 +483,14 @@
@@ -474,14 +484,14 @@
/* Kernel symbol table: Normal symbols */ \
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
__start___ksymtab = .; \
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__stop___ksymtab_gpl = .; \
} \
\
@@ -542,7 +552,7 @@
@@ -543,7 +553,7 @@
\
/* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \