diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-25 11:32:58 +0100 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-29 10:01:27 +0100 |
commit | 2777947a75c1033576d49e16969d82db9fc534fe (patch) | |
tree | 88d0d42e5652f583cf6712b784d9b4feba77703e /target/linux/generic/pending-4.14 | |
parent | 7863a8f302048857ce2276fbbdf899f474b8948c (diff) | |
download | upstream-2777947a75c1033576d49e16969d82db9fc534fe.tar.gz upstream-2777947a75c1033576d49e16969d82db9fc534fe.tar.bz2 upstream-2777947a75c1033576d49e16969d82db9fc534fe.zip |
kernel: bump 4.14 to 4.14.156
Refreshed all patches.
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')
-rw-r--r-- | target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch | 4 |
1 files changed, 2 insertions, 2 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 80ff556a49..dd402a15c8 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 @@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> errors per {size} bytes". --- a/drivers/mtd/maps/physmap_of_core.c +++ b/drivers/mtd/maps/physmap_of_core.c -@@ -114,37 +114,9 @@ static struct mtd_info *obsolete_probe(s +@@ -105,37 +105,9 @@ static struct mtd_info *obsolete_probe(s static const char * const part_probe_types_def[] = { "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; @@ -78,7 +78,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> const struct of_device_id *match; struct device_node *dp = dev->dev.of_node; struct resource res; -@@ -310,14 +282,8 @@ static int of_flash_probe(struct platfor +@@ -293,14 +265,8 @@ static int of_flash_probe(struct platfor info->cmtd->dev.parent = &dev->dev; mtd_set_of_node(info->cmtd, dp); |