aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorStijn Segers <foss@volatilesystems.org>2018-03-15 22:00:08 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-03-17 22:15:38 +0100
commit9899ffcfd35120f7a4aa1d401b85653e56b775b0 (patch)
tree6dc392a24cab58309b4727e8b6fde0aef9a9a0a3 /target/linux/brcm63xx
parent895ea64a761699dc29373b6d45a854dde4e08e1c (diff)
downloadupstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.tar.gz
upstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.tar.bz2
upstream-9899ffcfd35120f7a4aa1d401b85653e56b775b0.zip
kernel: bump 4.14 to 4.14.27
* Refreshed patches. * Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream) Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch b/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
index 42b522ca0a..2e663259d1 100644
--- a/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
+++ b/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
@@ -52,9 +52,9 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
cur_offset = slave->offset + slave->mtd.size;
}
-@@ -1162,7 +1161,9 @@ int parse_mtd_partitions(struct mtd_info
- types = types_of;
- }
+@@ -1134,7 +1133,9 @@ static int mtd_part_of_parse(struct mtd_
+ const char *fixed = "fixed-partitions";
+ int ret, err = 0;
- np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
+ np = mtd_get_of_node(master);
@@ -63,9 +63,9 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
of_property_for_each_string(np, "compatible", prop, compat) {
parser = mtd_part_get_compatible_parser(compat);
if (!parser)
-@@ -1178,8 +1179,12 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1206,8 +1207,12 @@ int parse_mtd_partitions(struct mtd_info
+ types = types_of;
}
- of_node_put(np);
- if (!types)
+ if (!types) {
@@ -76,4 +76,4 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+ }
for ( ; *types; types++) {
- pr_debug("%s: parsing partitions %s\n", master->name, *types);
+ /*