kernel: bump 4.9 to 4.9.119

[oweals/openwrt.git] / target / linux / generic / pending-4.9 / 402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch

diff --git a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index 466f315642d765a46e407bed4492d03820273c64..9c2650b45f167623d6a984ddb600ab82c010ef6c 100644 (file)
--- a/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++ b/target/linux/generic/pending-4.9/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -8,11 +8,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  include/linux/mtd/partitions.h |  2 ++
  2 files changed, 39 insertions(+)
 
-diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
-index f20207e32075..28f76315dfa0 100644
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -761,6 +761,36 @@ int mtd_del_partition(struct mtd_info *mtd, int partno)
+@@ -733,6 +733,36 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -49,7 +47,7 @@ index f20207e32075..28f76315dfa0 100644
  #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #else
-@@ -769,6 +799,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition);
+@@ -741,6 +771,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition);
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {
@@ -57,7 +55,7 @@ index f20207e32075..28f76315dfa0 100644
  }
  
  void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-@@ -783,6 +814,12 @@ static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
+@@ -755,6 +786,12 @@ static void mtd_partition_split(struct m
        if (rootfs_found)
                return;
  
@@ -70,8 +68,6 @@ index f20207e32075..28f76315dfa0 100644
        if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
            IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE))
                split_firmware(master, part);
-diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
-index baafd542432e..356e29815aa2 100644
 --- a/include/linux/mtd/partitions.h
 +++ b/include/linux/mtd/partitions.h
 @@ -74,6 +74,8 @@ struct mtd_part_parser_data {
@@ -83,6 +79,3 @@ index baafd542432e..356e29815aa2 100644
  };
  
  struct mtd_part_parser {
--- 
-2.11.0
-