diff options
| author | John Audia <therealgraysky@proton.me> | 2022-06-11 08:50:59 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:07 +0200 |
| commit | 81530d69ef582124f9cc657edacdca9727e805f8 (patch) | |
| tree | acfe6765ab312df7f4b5b1ac513a482c808151be /target/linux/ath79 | |
| parent | d8d8b82c599bd4578471478d79709bc2e3365630 (diff) | |
| download | upstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.gz upstream-81530d69ef582124f9cc657edacdca9727e805f8.tar.bz2 upstream-81530d69ef582124f9cc657edacdca9727e805f8.zip | |
kernel: bump 5.10 to 5.10.121
Manually rebased:
oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 706a4ec40cce108f484b40805bfa48619a0a7f09)
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 3beca822b5..38a65b183f 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 -@@ -3147,6 +3147,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3156,6 +3156,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; -@@ -3201,7 +3202,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co if (ret) return ret; |