diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-07-21 16:49:05 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:38 +0200 |
| commit | 2b2ac841e022054ff3390f25fa41336467530a91 (patch) | |
| tree | e964e271b8a1d9994888b800048b0be0fdc0349f /target/linux/generic/hack-5.10 | |
| parent | 92012dd8677a48bf77a69c17fd2b65abd4388f9b (diff) | |
| download | upstream-2b2ac841e022054ff3390f25fa41336467530a91.tar.gz upstream-2b2ac841e022054ff3390f25fa41336467530a91.tar.bz2 upstream-2b2ac841e022054ff3390f25fa41336467530a91.zip | |
kernel: bump 5.10 to 5.10.52
Add the new CONFIG_BATTERY_RT5033 to the generic configuration, as reported by
Paul Blazejowski. Resort the kconfig while at it.
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.10')
3 files changed, 4 insertions, 14 deletions
diff --git a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch index 6c2132e85e..ec93472851 100644 --- a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch @@ -219,7 +219,7 @@ --- a/block/partitions/msdos.c +++ b/block/partitions/msdos.c -@@ -565,6 +565,15 @@ static void parse_minix(struct parsed_pa +@@ -563,6 +563,15 @@ static void parse_minix(struct parsed_pa #endif /* CONFIG_MINIX_SUBPARTITION */ } @@ -235,7 +235,7 @@ static struct { unsigned char id; void (*parse)(struct parsed_partitions *, sector_t, sector_t, int); -@@ -576,6 +585,7 @@ static struct { +@@ -574,6 +583,7 @@ static struct { {UNIXWARE_PARTITION, parse_unixware}, {SOLARIS_X86_PARTITION, parse_solaris_x86}, {NEW_SOLARIS_X86_PARTITION, parse_solaris_x86}, diff --git a/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch b/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch index d1383cc2d1..fa80b0e5f7 100644 --- a/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch +++ b/target/linux/generic/hack-5.10/780-drivers-net-mediatek-register-of_platform-for-every-.patch @@ -14,11 +14,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -index ed4eacef17ce..666803817540 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) +@@ -3005,6 +3005,8 @@ static int mtk_add_mac(struct mtk_eth *e eth->netdev[id]->dev.of_node = np; eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; @@ -27,6 +25,3 @@ index ed4eacef17ce..666803817540 100644 return 0; --- -2.31.1 - diff --git a/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch b/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch index a8b8910423..330d9f1f80 100644 --- a/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch +++ b/target/linux/generic/hack-5.10/781-dsa-register-every-port-with-of_platform.patch @@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> net/dsa/dsa2.c | 2 + 1 file changed, 2 insertion(+) -diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c -index b71e87909f0e..55bbc1a769ca 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -14,6 +14,7 @@ @@ -27,7 +25,7 @@ index b71e87909f0e..55bbc1a769ca 100644 #include <net/devlink.h> #include "dsa_priv.h" -@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp) +@@ -288,6 +289,7 @@ static int dsa_port_setup(struct dsa_por break; case DSA_PORT_TYPE_USER: @@ -35,6 +33,3 @@ index b71e87909f0e..55bbc1a769ca 100644 dp->mac = of_get_mac_address(dp->dn); err = dsa_slave_create(dp); if (err) --- -2.31.1 - |