diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 10:27:20 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 11:40:05 +0200 |
| commit | 8c1e760ab60994de26d2a2c85f91e86192999dfb (patch) | |
| tree | 741281d011dac79b540cc69ed4cd39f6a426ecb8 /target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch | |
| parent | 4052443a235433fb97af9711bf6429cd05820ba9 (diff) | |
| download | upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.gz upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.bz2 upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.zip | |
kernel: backport upstream mtdpart.c cleanups
Except for renames and line changes the only conflict was in
allocate_partition in handling MTD_WRITEABLE. Hopefully it was handled
correctly.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
| -rw-r--r-- | target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch index 0d71743bdb..8bca58a31e 100644 --- a/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/patches-4.9/160-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -116,7 +116,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <linux/err.h> #include "mtdcore.h" -@@ -779,6 +780,42 @@ void deregister_mtd_parser(struct mtd_pa +@@ -815,6 +816,42 @@ void deregister_mtd_parser(struct mtd_pa EXPORT_SYMBOL_GPL(deregister_mtd_parser); /* @@ -159,7 +159,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! */ -@@ -815,6 +852,13 @@ int parse_mtd_partitions(struct mtd_info +@@ -872,6 +909,13 @@ int parse_mtd_partitions(struct mtd_info { struct mtd_part_parser *parser; int ret, err = 0; @@ -173,7 +173,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> if (!types) types = default_mtd_part_types; -@@ -846,6 +890,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -897,6 +941,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } |