kernel: Bump to 4.14.303

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 44276e85a62f28ee177b209d235c139a9cf36c48..3bad5deaadaf65188d9f6034ca7e50cc5054487a 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .302
+LINUX_VERSION-4.14 = .303
 LIBRE_REV = 1
 
-LINUX_KERNEL_HASH-4.14.302 = f2cb4c9172e5cadc7522ab6c3e373385c81ff12086364450162ea0c24c354fd8
+LINUX_KERNEL_HASH-4.14.303 = 4e39c980ff217cd4f9d7423303d46715a8ce36fcdd82b05ff6991b0e06fec5b5
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
index 8e1f83de597b23345cdee1b9ebeed4e1e434d67a..1cf5a99deb2e84e86cdc924dd28c630e84ac2490 100644 (file)
--- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
+++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
 
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2130,7 +2130,8 @@ static const struct usb_device_id option
+@@ -2133,7 +2133,8 @@ static const struct usb_device_id option
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },

diff --git a/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch b/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch
index df6429776f070eb269a744dd9ee477e666131078..6058a476a00ed18263ef78c944c8727c49c3253f 100644 (file)
--- a/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch
+++ b/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch
@@ -24,7 +24,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -641,20 +641,12 @@ static int mtd_add_device_partitions(str
+@@ -643,20 +643,12 @@ static int mtd_add_device_partitions(str
  {
        const struct mtd_partition *real_parts = parts->parts;
        int nbparts = parts->nr_parts;
@@ -49,7 +49,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
  
        return 0;
  }
-@@ -714,6 +706,12 @@ int mtd_device_parse_register(struct mtd
+@@ -716,6 +708,12 @@ int mtd_device_parse_register(struct mtd
  
        mtd_set_dev_defaults(mtd);
  
@@ -62,7 +62,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
        memset(&parsed, 0, sizeof(parsed));
  
        ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
-@@ -753,6 +751,9 @@ int mtd_device_parse_register(struct mtd
+@@ -755,6 +753,9 @@ int mtd_device_parse_register(struct mtd
  out:
        /* Cleanup any parsed partitions */
        mtd_part_parser_cleanup(&parsed);

diff --git a/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch b/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch
index 1042e674c33c58fdc835dff0dee4ff3e7542f9b5..49892306374dcfd8309680264df70ea2136ebf55 100644 (file)
--- a/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch
+++ b/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch
@@ -24,7 +24,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -636,21 +636,6 @@ out_error:
+@@ -638,21 +638,6 @@ out_error:
        return ret;
  }
  
@@ -46,7 +46,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
  /*
   * Set a few defaults based on the parent devices, if not provided by the
   * driver
-@@ -701,7 +686,7 @@ int mtd_device_parse_register(struct mtd
+@@ -703,7 +688,7 @@ int mtd_device_parse_register(struct mtd
                              const struct mtd_partition *parts,
                              int nr_parts)
  {
@@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
        int ret;
  
        mtd_set_dev_defaults(mtd);
-@@ -712,24 +697,20 @@ int mtd_device_parse_register(struct mtd
+@@ -714,24 +699,20 @@ int mtd_device_parse_register(struct mtd
                        return ret;
        }
  

diff --git a/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch
index d017fd452b712cd86990791c3d753ebfdfb47a8a..64fc490da8a0affe1a7bb4eb55d8f6d087283d2c 100644 (file)
--- a/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch
+++ b/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch
@@ -29,7 +29,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -686,7 +686,6 @@ int mtd_device_parse_register(struct mtd
+@@ -688,7 +688,6 @@ int mtd_device_parse_register(struct mtd
                              const struct mtd_partition *parts,
                              int nr_parts)
  {
@@ -37,7 +37,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
        int ret;
  
        mtd_set_dev_defaults(mtd);
-@@ -698,13 +697,10 @@ int mtd_device_parse_register(struct mtd
+@@ -700,13 +699,10 @@ int mtd_device_parse_register(struct mtd
        }
  
        /* Prefer parsed partitions over driver-provided fallback */
@@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
                ret = add_mtd_partitions(mtd, parts, nr_parts);
        else if (!device_is_registered(&mtd->dev))
                ret = add_mtd_device(mtd);
-@@ -730,8 +726,6 @@ int mtd_device_parse_register(struct mtd
+@@ -732,8 +728,6 @@ int mtd_device_parse_register(struct mtd
        }
  
  out:

diff --git a/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch b/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
index 7f90cf946a4d444fd01d6da07cb64a65d8e3f5b9..aac07d2126ce203a33711235a417b6d913ea1074 100644 (file)
--- a/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
+++ b/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
@@ -25,7 +25,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -650,6 +650,8 @@ static void mtd_set_dev_defaults(struct
+@@ -652,6 +652,8 @@ static void mtd_set_dev_defaults(struct
        } else {
                pr_debug("mtd device won't show a device symlink in sysfs\n");
        }

diff --git a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
index 168fa4e5af8156bb66cfee9f755f9a80f6843794..e6ea35643632e48ab4b747e52a71e1a6cd911ab3 100644 (file)
--- a/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
+++ b/target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch
@@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
          device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2032,7 +2032,7 @@ static int __init pktsched_init(void)
+@@ -2036,7 +2036,7 @@ static int __init pktsched_init(void)
                return err;
        }
  

diff --git a/target/linux/generic/pending-4.14/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-4.14/480-mtd-set-rootfs-to-be-root-dev.patch
index 6cddaf01b75cb58cfb377f568f2c375af87e2f1b..129625aa14a1ad826d3393f0f79704ca2cc11ecf 100644 (file)
--- a/target/linux/generic/pending-4.14/480-mtd-set-rootfs-to-be-root-dev.patch
+++ b/target/linux/generic/pending-4.14/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
-@@ -578,6 +579,15 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -580,6 +581,15 @@ int add_mtd_device(struct mtd_info *mtd)
           of this try_ nonsense, and no bitching about it
           either. :) */
        __module_get(THIS_MODULE);

diff --git a/target/linux/generic/pending-4.14/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-4.14/495-mtd-core-add-get_mtd_device_by_node.patch
index 2886742d4d7966a0778b9c77cb0e1dbe84a14d5e..abc2b18437446dc7f4392c306f7d0a8d6e47c36e 100644 (file)
--- a/target/linux/generic/pending-4.14/495-mtd-core-add-get_mtd_device_by_node.patch
+++ b/target/linux/generic/pending-4.14/495-mtd-core-add-get_mtd_device_by_node.patch
@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -924,6 +924,44 @@ out_unlock:
+@@ -926,6 +926,44 @@ out_unlock:
  }
  EXPORT_SYMBOL_GPL(get_mtd_device_nm);