diff options
author | John Audia <therealgraysky@proton.me> | 2023-03-12 10:03:16 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-03-20 22:44:28 +0100 |
commit | d4aad642ff80750ec16a58058eb6da718e2129cd (patch) | |
tree | 63cca16405ef64be4b8e67227d190285c22b5e94 /target/linux/ath79 | |
parent | bd2103e9bc6b4c1787baa03f51c83619bf4b9ec0 (diff) | |
download | upstream-d4aad642ff80750ec16a58058eb6da718e2129cd.tar.gz upstream-d4aad642ff80750ec16a58058eb6da718e2129cd.tar.bz2 upstream-d4aad642ff80750ec16a58058eb6da718e2129cd.zip |
kernel: bump 5.10 to 5.10.173
Manually rebased:
ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ath79')
-rw-r--r-- | target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch index c6569c81ce..99985eba40 100644 --- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -3143,6 +3143,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3152,6 +3152,7 @@ int spi_nor_scan(struct spi_nor *nor, co struct device *dev = nor->dev; struct mtd_info *mtd = &nor->mtd; struct device_node *np = spi_nor_get_flash_node(nor); @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> int ret; int i; -@@ -3197,7 +3198,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3206,7 +3207,12 @@ int spi_nor_scan(struct spi_nor *nor, co if (ret) return ret; |