diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-11-28 23:02:21 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-12-01 21:57:55 +0100 |
| commit | c72b7a4f0d8d476df5fb0f9d6a2ad8fadb223025 (patch) | |
| tree | dafbc4ce7eac59a120c3a55db3bc5dbd5dea0855 /target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch | |
| parent | c420f7767855e51d88f82307da0aa28af3d44f64 (diff) | |
| download | upstream-c72b7a4f0d8d476df5fb0f9d6a2ad8fadb223025.tar.gz upstream-c72b7a4f0d8d476df5fb0f9d6a2ad8fadb223025.tar.bz2 upstream-c72b7a4f0d8d476df5fb0f9d6a2ad8fadb223025.zip | |
kernel: bump 4.14 to 4.14.209
Refreshed all patches.
Altered patches:
- 804-i2c-support-layerscape.patch
Compile-tested on: ipq40xx, ath79, layerscape/armv8_64b
Runtime-tested on: ipq40xx, ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch b/target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch index 9bb713e780..9fad2663ea 100644 --- a/target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch +++ b/target/linux/generic/pending-4.14/499-mtd-parser-cmdline-Fix-parsing-of-part-names-with-co.patch @@ -23,11 +23,9 @@ Forwarded: https://patchwork.ozlabs.org/project/linux-mtd/patch/20201122001533.9 Fixes: eb13fa022741 ("mtd: parser: cmdline: Support MTD names containing one or more colons") Signed-off-by: Sven Eckelmann <sven@narfation.org> -diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c -index 0625b25620ca766318ea4646a6e3761ff4d3a4cc..22881ea4c132ea5a5ba7aebd025d91bf1cd023af 100644 --- a/drivers/mtd/cmdlinepart.c +++ b/drivers/mtd/cmdlinepart.c -@@ -218,7 +218,7 @@ static int mtdpart_setup_real(char *s) +@@ -228,7 +228,7 @@ static int mtdpart_setup_real(char *s) struct cmdline_mtd_partition *this_mtd; struct mtd_partition *parts; int mtd_id_len, num_parts; @@ -36,7 +34,7 @@ index 0625b25620ca766318ea4646a6e3761ff4d3a4cc..22881ea4c132ea5a5ba7aebd025d91bf /* * Replace the first ';' by a NULL char so strrchr can work -@@ -228,6 +228,13 @@ static int mtdpart_setup_real(char *s) +@@ -238,6 +238,13 @@ static int mtdpart_setup_real(char *s) if (semicol) *semicol = '\0'; @@ -50,7 +48,7 @@ index 0625b25620ca766318ea4646a6e3761ff4d3a4cc..22881ea4c132ea5a5ba7aebd025d91bf mtd_id = s; /* -@@ -237,6 +244,10 @@ static int mtdpart_setup_real(char *s) +@@ -247,6 +254,10 @@ static int mtdpart_setup_real(char *s) */ p = strrchr(s, ':'); |