diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-06 14:06:33 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-10 09:50:42 +0100 |
commit | a9b95921969eeb0b7b2271c95dd47a6a0c24a18a (patch) | |
tree | 415c485867c3fa460d61477003157317076e97fb /target/linux/generic/backport-4.9 | |
parent | e964338110526b3692847769343816cd2f853d18 (diff) | |
download | upstream-a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.tar.gz upstream-a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.tar.bz2 upstream-a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.zip |
kernel: bump 4.9 to 4.9.206
Refreshed all patches.
Altered patches:
- 400-mtd-add-rootfs-split-support.patch
Compile-tested on: none
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9')
11 files changed, 29 insertions, 29 deletions
diff --git a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch index d312e081a9..70c1462d3f 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch @@ -18,7 +18,7 @@ Acked-by: Brian Norris <computersforpeace@gmail.com> --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -807,6 +807,27 @@ static const char * const default_mtd_pa +@@ -832,6 +832,27 @@ static const char * const default_mtd_pa NULL }; @@ -46,7 +46,7 @@ Acked-by: Brian Norris <computersforpeace@gmail.com> /** * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) -@@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info +@@ -872,16 +893,10 @@ int parse_mtd_partitions(struct mtd_info parser ? parser->name : NULL); if (!parser) continue; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch index d93f4ba4b5..dea64a1f6d 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch @@ -54,7 +54,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> static struct mtd_part *allocate_partition(struct mtd_info *master, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -675,6 +649,48 @@ int mtd_add_partition(struct mtd_info *m +@@ -686,6 +660,48 @@ err_remove_part: } EXPORT_SYMBOL_GPL(mtd_add_partition); @@ -103,7 +103,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> int mtd_del_partition(struct mtd_info *master, int partno) { struct mtd_part *slave, *next; -@@ -686,12 +702,7 @@ int mtd_del_partition(struct mtd_info *m +@@ -697,12 +713,7 @@ int mtd_del_partition(struct mtd_info *m (slave->mtd.index == partno)) { sysfs_remove_files(&slave->mtd.dev.kobj, mtd_partition_attrs); diff --git a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch index 0f1b502b70..72edb25cc3 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch @@ -25,7 +25,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -660,6 +660,8 @@ static int __mtd_del_partition(struct mt +@@ -671,6 +671,8 @@ static int __mtd_del_partition(struct mt { int err; @@ -34,7 +34,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> err = del_mtd_device(&priv->mtd); if (err) return err; -@@ -700,8 +702,6 @@ int mtd_del_partition(struct mtd_info *m +@@ -711,8 +713,6 @@ int mtd_del_partition(struct mtd_info *m list_for_each_entry_safe(slave, next, &mtd_partitions, list) if ((slave->master == master) && (slave->mtd.index == partno)) { diff --git a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch index 7951227654..490eaa2e7c 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch @@ -578,7 +578,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> if (IS_ERR(new)) return PTR_ERR(new); -@@ -683,7 +689,7 @@ int del_mtd_partitions(struct mtd_info * +@@ -694,7 +700,7 @@ int del_mtd_partitions(struct mtd_info * mutex_lock(&mtd_partitions_mutex); list_for_each_entry_safe(slave, next, &mtd_partitions, list) @@ -587,7 +587,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> ret = __mtd_del_partition(slave); if (ret < 0) err = ret; -@@ -700,7 +706,7 @@ int mtd_del_partition(struct mtd_info *m +@@ -711,7 +717,7 @@ int mtd_del_partition(struct mtd_info *m mutex_lock(&mtd_partitions_mutex); list_for_each_entry_safe(slave, next, &mtd_partitions, list) @@ -596,7 +596,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> (slave->mtd.index == partno)) { ret = __mtd_del_partition(slave); break; -@@ -933,6 +939,6 @@ uint64_t mtd_get_device_size(const struc +@@ -958,6 +964,6 @@ uint64_t mtd_get_device_size(const struc if (!mtd_is_partition(mtd)) return mtd->size; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch index 0d3e10ac20..578e59a8a1 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch @@ -31,7 +31,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> &parent->dev : parent->dev.parent; slave->mtd.dev.of_node = part->of_node; -@@ -664,8 +664,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); +@@ -675,8 +675,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); */ static int __mtd_del_partition(struct mtd_part *priv) { @@ -49,7 +49,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs); err = del_mtd_device(&priv->mtd); -@@ -680,16 +689,16 @@ static int __mtd_del_partition(struct mt +@@ -691,16 +700,16 @@ static int __mtd_del_partition(struct mt /* * This function unregisters and destroy all slave MTD objects which are @@ -69,7 +69,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> ret = __mtd_del_partition(slave); if (ret < 0) err = ret; -@@ -699,14 +708,14 @@ int del_mtd_partitions(struct mtd_info * +@@ -710,14 +719,14 @@ int del_mtd_partitions(struct mtd_info * return err; } @@ -86,7 +86,7 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> (slave->mtd.index == partno)) { ret = __mtd_del_partition(slave); break; -@@ -939,6 +948,6 @@ uint64_t mtd_get_device_size(const struc +@@ -964,6 +973,6 @@ uint64_t mtd_get_device_size(const struc if (!mtd_is_partition(mtd)) return mtd->size; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch index a28ee316fa..c4c517f238 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch @@ -76,9 +76,9 @@ Signed-off-by: Brian Norris <computersforpeace@gmail.com> static struct mtd_part *allocate_partition(struct mtd_info *parent, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -758,6 +787,8 @@ int add_mtd_partitions(struct mtd_info * +@@ -778,6 +807,8 @@ int add_mtd_partitions(struct mtd_info * + } - add_mtd_device(&slave->mtd); mtd_add_partition_attrs(slave); + if (parts[i].types) + mtd_parse_part(slave, parts[i].types); diff --git a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch index 60eace2a34..cb464996b7 100644 --- a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch @@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> #include "mtdcore.h" -@@ -886,6 +887,92 @@ static int mtd_part_do_parse(struct mtd_ +@@ -911,6 +912,92 @@ static int mtd_part_do_parse(struct mtd_ } /** @@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) * @types: names of partition parsers to try or %NULL -@@ -917,19 +1004,30 @@ int parse_mtd_partitions(struct mtd_info +@@ -942,19 +1029,30 @@ int parse_mtd_partitions(struct mtd_info types = default_mtd_part_types; for ( ; *types; types++) { diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch index 59f53df101..b22ddfabd8 100644 --- a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch @@ -22,7 +22,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -932,7 +932,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -957,7 +957,7 @@ static int mtd_part_of_parse(struct mtd_ struct device_node *np; struct property *prop; const char *compat; @@ -31,7 +31,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> int ret, err = 0; np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -@@ -952,7 +952,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -977,7 +977,7 @@ static int mtd_part_of_parse(struct mtd_ of_node_put(np); /* diff --git a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch index 29aa3b9e8d..4bedd54a03 100644 --- a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch +++ b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch @@ -98,7 +98,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> } static struct mtd_part *allocate_partition(struct mtd_info *parent, -@@ -973,30 +960,27 @@ static int mtd_part_of_parse(struct mtd_ +@@ -998,30 +985,27 @@ static int mtd_part_of_parse(struct mtd_ } /** @@ -136,7 +136,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> struct mtd_part_parser *parser; int ret, err = 0; -@@ -1010,7 +994,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1035,7 +1019,7 @@ int parse_mtd_partitions(struct mtd_info * handled in a separated function. */ if (!strcmp(*types, "ofpart")) { @@ -145,7 +145,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> } else { pr_debug("%s: parsing partitions %s\n", master->name, *types); -@@ -1021,13 +1005,17 @@ int parse_mtd_partitions(struct mtd_info +@@ -1046,13 +1030,17 @@ int parse_mtd_partitions(struct mtd_info parser ? parser->name : NULL); if (!parser) continue; diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 6052bf5777..d8d8ad5ea4 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c -@@ -1079,7 +1079,7 @@ static int c_can_poll(struct napi_struct +@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct end: if (work_done < quota) { @@ -313,7 +313,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -1532,7 +1532,7 @@ static int atl1e_clean(struct napi_struc +@@ -1534,7 +1534,7 @@ static int atl1e_clean(struct napi_struc /* If no Tx and not enough Rx work done, exit the polling mode */ if (work_done < budget) { quit_polling: diff --git a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch index 4186f5599f..758de9fdf3 100644 --- a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +++ b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch @@ -55,9 +55,9 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> static struct mtd_part *allocate_partition(struct mtd_info *parent, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -775,8 +759,8 @@ int add_mtd_partitions(struct mtd_info * +@@ -795,8 +779,8 @@ int add_mtd_partitions(struct mtd_info * + } - add_mtd_device(&slave->mtd); mtd_add_partition_attrs(slave); - if (parts[i].types) - mtd_parse_part(slave, parts[i].types); @@ -66,7 +66,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> cur_offset = slave->offset + slave->mtd.size; } -@@ -852,6 +836,12 @@ static const char * const default_mtd_pa +@@ -877,6 +861,12 @@ static const char * const default_mtd_pa NULL }; @@ -79,7 +79,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> static int mtd_part_do_parse(struct mtd_part_parser *parser, struct mtd_info *master, struct mtd_partitions *pparts, -@@ -922,7 +912,9 @@ static int mtd_part_of_parse(struct mtd_ +@@ -947,7 +937,9 @@ static int mtd_part_of_parse(struct mtd_ const char *fixed = "fixed-partitions"; int ret, err = 0; @@ -90,7 +90,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> of_property_for_each_string(np, "compatible", prop, compat) { parser = mtd_part_get_compatible_parser(compat); if (!parser) -@@ -985,7 +977,8 @@ int parse_mtd_partitions(struct mtd_info +@@ -1010,7 +1002,8 @@ int parse_mtd_partitions(struct mtd_info int ret, err = 0; if (!types) |