diff options
| author | John Audia <graysky@archlinux.us> | 2021-10-31 07:08:40 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 14:48:20 +0100 |
| commit | 30b0bd69fd57d6179d1d8825710d3bf2a40bd98b (patch) | |
| tree | 37d78070d20c43ea1a1cd637ebb8870e7eed5b0f /target/linux/pistachio | |
| parent | 4b26ba4155db8403beb5de42bcff5bd04800a67f (diff) | |
| download | upstream-30b0bd69fd57d6179d1d8825710d3bf2a40bd98b.tar.gz upstream-30b0bd69fd57d6179d1d8825710d3bf2a40bd98b.tar.bz2 upstream-30b0bd69fd57d6179d1d8825710d3bf2a40bd98b.zip | |
kernel: bump 5.4 to 5.4.156
Removed upstreamed:
backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
All other patches automatically rebased.
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/pistachio')
| -rw-r--r-- | target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch index 69a8303d2b..cdf0e49b21 100644 --- a/target/linux/pistachio/patches-5.4/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/pistachio/patches-5.4/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/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -4938,6 +4938,7 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -4939,6 +4939,7 @@ int spi_nor_scan(struct spi_nor *nor, co struct mtd_info *mtd = &nor->mtd; struct device_node *np = spi_nor_get_flash_node(nor); struct spi_nor_flash_parameter *params = &nor->params; @@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com> int ret; int i; -@@ -5000,7 +5001,12 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -5001,7 +5002,12 @@ int spi_nor_scan(struct spi_nor *nor, co /* Init flash parameters based on flash_info struct and SFDP */ spi_nor_init_params(nor); |