diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-06 15:04:47 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-10 09:54:20 +0100 |
commit | 5d92949019d898889a2f2c5412662af9083e5bee (patch) | |
tree | 9ec05f7fc63c58ee4f3b679ca7713637ec5da573 /target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch | |
parent | 361b5556728a4c069df4c4fb259fa141f71f3958 (diff) | |
download | upstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.gz upstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.bz2 upstream-5d92949019d898889a2f2c5412662af9083e5bee.zip |
kernel: bump 4.14 to 4.14.158
Refreshed all patches.
Altered patches:
- 400-mtd-add-rootfs-split-support.patch
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch index dd402a15c8..cbc21ac6b1 100644 --- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <linux/err.h> #include <linux/of.h> -@@ -835,6 +836,32 @@ void deregister_mtd_parser(struct mtd_pa +@@ -860,6 +861,32 @@ void deregister_mtd_parser(struct mtd_pa EXPORT_SYMBOL_GPL(deregister_mtd_parser); /* @@ -137,7 +137,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you * are changing this array! */ -@@ -983,6 +1010,13 @@ int parse_mtd_partitions(struct mtd_info +@@ -1008,6 +1035,13 @@ int parse_mtd_partitions(struct mtd_info struct mtd_partitions pparts = { }; struct mtd_part_parser *parser; int ret, err = 0; @@ -151,7 +151,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> if (!types) types = mtd_is_partition(master) ? default_subpartition_types : -@@ -1024,6 +1058,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1049,6 +1083,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } |