From a70a719e81f074b18ba52fbe27361053e8475580 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Tue, 10 Dec 2019 19:40:41 -0800 Subject: [PATCH] kernel: bump to 4.9.206, 4.14.158, 4.19.88 --- ...372b5ae89567f1028954522290f1b038d7a8.patch | 552 ++++++++++++++++++ ...5921969eeb0b7b2271c95dd47a6a0c24a18a.patch | 472 +++++++++++++++ ...583d697c17f00a533d6efa13754c21630eda.patch | 452 ++++++++++++++ include/kernel-version.mk | 12 +- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- ...-0030-mm-Remove-the-PFN-busy-warning.patch | 2 +- ...Set-base-to-0-give-expected-gpio-num.patch | 2 +- ...044-MMC-added-alternative-MMC-driver.patch | 6 +- ...-brcm-adds-support-for-BCM43341-wifi.patch | 8 +- ...rcmfmac-Mute-expected-startup-errors.patch | 2 +- ...rcmfmac-Mute-expected-startup-errors.patch | 2 +- ...Better-coalescing-parameter-defaults.patch | 2 +- ...-link-energy-detect-powerdown-for-ex.patch | 2 +- ...ctrl-bcm2835-Add-support-for-BCM2838.patch | 2 +- .../0004-boot-sq201-from-sda1.patch | 20 - ...8-ARM-dts-Enable-Gemini-flash-access.patch | 4 +- ...ption-fix-dwm-158-3g-modem-interface.patch | 2 +- ...dd-of_match_table-parser-matching-fo.patch | 4 +- ...t-parser-to-fixed-partitions-as-it-f.patch | 4 +- ...ding-registering-partitions-to-the-p.patch | 6 +- ...se-DT-info-for-parsing-partitions-wi.patch | 10 +- ...fault-compression-selection-in-ubifs.patch | 46 -- ...tions-factor-out-code-calling-parser.patch | 4 +- ...ns-add-helper-for-deleting-partition.patch | 4 +- ...emove-sysfs-files-when-deleting-all-.patch | 4 +- ...ename-master-to-the-parent-where-app.patch | 6 +- ...itions-add-support-for-subpartitions.patch | 8 +- ...ns-add-support-for-partition-parsers.patch | 4 +- ...dd-of_match_table-parser-matching-fo.patch | 4 +- ...t-parser-to-fixed-partitions-as-it-f.patch | 4 +- ...ding-registering-partitions-to-the-p.patch | 6 +- ...90-net-generalize-napi_complete_done.patch | 4 +- ...se-DT-info-for-parsing-partitions-wi.patch | 10 +- .../generic/hack-4.14/930-crashlog.patch | 2 +- .../generic/hack-4.19/902-debloat_proc.patch | 2 +- .../generic/hack-4.19/930-crashlog.patch | 2 +- ...-generic-parsing-of-linux-part-probe.patch | 6 +- .../400-mtd-add-rootfs-split-support.patch | 16 +- ...for-different-partition-parser-types.patch | 4 +- ...arsers-for-rootfs-and-firmware-split.patch | 4 +- .../404-mtd-add-more-helper-functions.patch | 2 +- .../pending-4.14/920-mangle_bootargs.patch | 4 +- ...e_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- .../400-mtd-add-rootfs-split-support.patch | 16 +- ...for-different-partition-parser-types.patch | 4 +- ...arsers-for-rootfs-and-firmware-split.patch | 4 +- .../404-mtd-add-more-helper-functions.patch | 2 +- .../pending-4.19/920-mangle_bootargs.patch | 4 +- ...-generic-parsing-of-linux-part-probe.patch | 6 +- .../400-mtd-add-rootfs-split-support.patch | 16 +- ...for-different-partition-parser-types.patch | 4 +- ...arsers-for-rootfs-and-firmware-split.patch | 4 +- .../404-mtd-add-more-helper-functions.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- ...onger-core-rest-timeout-in-dwc2_core.patch | 29 - .../202-core-linux-support-layerscape.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- ...0031-uvc-add-iPassion-iP2970-support.patch | 2 +- .../patches-4.14/0200-linkit_bootstrap.patch | 2 +- 63 files changed, 1603 insertions(+), 222 deletions(-) create mode 100644 88ca372b5ae89567f1028954522290f1b038d7a8.patch create mode 100644 a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.patch create mode 100644 d395583d697c17f00a533d6efa13754c21630eda.patch delete mode 100644 target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch delete mode 100644 target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch delete mode 100644 target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch diff --git a/88ca372b5ae89567f1028954522290f1b038d7a8.patch b/88ca372b5ae89567f1028954522290f1b038d7a8.patch new file mode 100644 index 0000000000..d1e98519f5 --- /dev/null +++ b/88ca372b5ae89567f1028954522290f1b038d7a8.patch @@ -0,0 +1,552 @@ +From 88ca372b5ae89567f1028954522290f1b038d7a8 Mon Sep 17 00:00:00 2001 +From: Koen Vandeputte +Date: Fri, 6 Dec 2019 16:25:06 +0100 +Subject: [PATCH] kernel: bump 4.19 to 4.19.88 + +Refreshed all patches. + +Remove upstreamed: +- 0004-boot-sq201-from-sda1.patch +- 500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch +- 0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch + +Altered patches: +- 0011-ARM-dts-Fix-up-SQ201-flash-access.patch +- 400-mtd-add-rootfs-split-support.patch +- 0101-pci-mediatek-backport-fix-pcie.patch + +Compile-tested on: cns3xxx +Runtime-tested on: cns3xxx + +Signed-off-by: Koen Vandeputte +--- + include/kernel-version.mk | 4 +- + .../910-unaligned_access_hacks.patch | 2 +- + ...-0030-mm-Remove-the-PFN-busy-warning.patch | 2 +- + ...Set-base-to-0-give-expected-gpio-num.patch | 2 +- + ...044-MMC-added-alternative-MMC-driver.patch | 6 +- + ...-brcm-adds-support-for-BCM43341-wifi.patch | 8 +- + ...rcmfmac-Mute-expected-startup-errors.patch | 2 +- + ...rcmfmac-Mute-expected-startup-errors.patch | 2 +- + ...Better-coalescing-parameter-defaults.patch | 2 +- + ...-link-energy-detect-powerdown-for-ex.patch | 2 +- + ...ctrl-bcm2835-Add-support-for-BCM2838.patch | 2 +- + .../0004-boot-sq201-from-sda1.patch | 20 -- + ...8-ARM-dts-Enable-Gemini-flash-access.patch | 4 +- + ...11-ARM-dts-Fix-up-SQ201-flash-access.patch | 44 +--- + ...fault-compression-selection-in-ubifs.patch | 46 ---- + .../generic/hack-4.19/902-debloat_proc.patch | 2 +- + .../generic/hack-4.19/930-crashlog.patch | 2 +- + ...e_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- + .../400-mtd-add-rootfs-split-support.patch | 16 +- + ...for-different-partition-parser-types.patch | 4 +- + ...arsers-for-rootfs-and-firmware-split.patch | 4 +- + .../404-mtd-add-more-helper-functions.patch | 2 +- + .../pending-4.19/920-mangle_bootargs.patch | 4 +- + ...onger-core-rest-timeout-in-dwc2_core.patch | 29 --- + .../0101-pci-mediatek-backport-fix-pcie.patch | 200 ++---------------- + ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- + 26 files changed, 57 insertions(+), 358 deletions(-) + delete mode 100644 target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch + delete mode 100644 target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch + delete mode 100644 target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch + +diff --git a/include/kernel-version.mk b/include/kernel-version.mk +index 9a70b4cdd81..1bb0fe99119 100644 +--- a/include/kernel-version.mk ++++ b/include/kernel-version.mk +@@ -8,11 +8,11 @@ endif + + LINUX_VERSION-4.9 = .206 + LINUX_VERSION-4.14 = .158 +-LINUX_VERSION-4.19 = .86 ++LINUX_VERSION-4.19 = .88 + + LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 + LINUX_KERNEL_HASH-4.14.158 = 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 +-LINUX_KERNEL_HASH-4.19.86 = bf2cbba319d43d1bd9e876ac0b55ab83118d1a1e61cce3c929d5371f7567bff6 ++LINUX_KERNEL_HASH-4.19.88 = c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe + + 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/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +index ad7b12d650c..7784801c8cb 100644 +--- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch ++++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +@@ -214,7 +214,7 @@ + #include + #include + #include +-@@ -836,10 +837,10 @@ static void tcp_v6_send_response(const s ++@@ -837,10 +838,10 @@ static void tcp_v6_send_response(const s + topt = (__be32 *)(t1 + 1); + + if (tsecr) { +diff --git a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch +index cfc52ead26a..f08379057f9 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch +@@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt + + --- a/mm/page_alloc.c + +++ b/mm/page_alloc.c +-@@ -7980,8 +7980,6 @@ int alloc_contig_range(unsigned long sta ++@@ -7977,8 +7977,6 @@ int alloc_contig_range(unsigned long sta + + /* Make sure the range is really isolated. */ + if (test_pages_isolated(outer_start, end, false)) { +diff --git a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch +index e3aeded95cb..307e82ede4e 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch +@@ -11,7 +11,7 @@ Signed-off-by: Noralf Tronnes + + --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c + +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c +-@@ -352,7 +352,7 @@ static const struct gpio_chip bcm2835_gp ++@@ -350,7 +350,7 @@ static const struct gpio_chip bcm2835_gp + .get_direction = bcm2835_gpio_get_direction, + .get = bcm2835_gpio_get, + .set = bcm2835_gpio_set, +diff --git a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch +index af67d42f8d0..25f587b2d70 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch +@@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell + static inline int mmc_blk_part_switch(struct mmc_card *card, + unsigned int part_type); + +-@@ -2919,6 +2926,7 @@ static int mmc_blk_probe(struct mmc_card ++@@ -2913,6 +2920,7 @@ static int mmc_blk_probe(struct mmc_card + { + struct mmc_blk_data *md, *part_md; + char cap_str[10]; +@@ -133,7 +133,7 @@ Signed-off-by: Phil Elwell + + /* + * Check that the card supports the command class(es) we need. +-@@ -2926,7 +2934,16 @@ static int mmc_blk_probe(struct mmc_card ++@@ -2920,7 +2928,16 @@ static int mmc_blk_probe(struct mmc_card + if (!(card->csd.cmdclass & CCC_BLOCK_READ)) + return -ENODEV; + +@@ -151,7 +151,7 @@ Signed-off-by: Phil Elwell + + card->complete_wq = alloc_workqueue("mmc_complete", + WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); +-@@ -2941,9 +2958,14 @@ static int mmc_blk_probe(struct mmc_card ++@@ -2935,9 +2952,14 @@ static int mmc_blk_probe(struct mmc_card + + string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, + cap_str, sizeof(cap_str)); +diff --git a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch b/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch +index d61948995cf..4251ecafefc 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch +@@ -57,7 +57,7 @@ Signed-off-by: Phil Elwell + cfg->pwr_save = enabled; + if (!check_vif_up(ifp->vif)) { + +-@@ -6776,12 +6778,18 @@ static s32 brcmf_translate_country_code( ++@@ -6786,12 +6788,18 @@ static s32 brcmf_translate_country_code( + struct brcmfmac_pd_cc *country_codes; + struct brcmfmac_pd_cc_entry *cc; + s32 found_index; +@@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell + } + + if ((alpha2[0] == ccreq->country_abbrev[0]) && +-@@ -6805,10 +6813,14 @@ static s32 brcmf_translate_country_code( ++@@ -6815,10 +6823,14 @@ static s32 brcmf_translate_country_code( + brcmf_dbg(TRACE, "No country code match found\n"); + return -EINVAL; + } +@@ -109,7 +109,7 @@ Signed-off-by: Phil Elwell + + --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c + +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +-@@ -608,6 +608,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); ++@@ -614,6 +614,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); + BRCMF_FW_DEF(4330, "brcmfmac4330-sdio"); + BRCMF_FW_DEF(4334, "brcmfmac4334-sdio"); + BRCMF_FW_DEF(43340, "brcmfmac43340-sdio"); +@@ -117,7 +117,7 @@ Signed-off-by: Phil Elwell + BRCMF_FW_DEF(4335, "brcmfmac4335-sdio"); + BRCMF_FW_DEF(43362, "brcmfmac43362-sdio"); + BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); +-@@ -628,7 +629,7 @@ static const struct brcmf_firmware_mappi ++@@ -634,7 +635,7 @@ static const struct brcmf_firmware_mappi + BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330), + BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334), + BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340), +diff --git a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch +index 27e6a201a5b..8111f9d42ce 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch +@@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell + + --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c + +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +-@@ -6844,6 +6844,8 @@ static void brcmf_cfg80211_reg_notifier( ++@@ -6854,6 +6854,8 @@ static void brcmf_cfg80211_reg_notifier( + /* ignore non-ISO3166 country codes */ + for (i = 0; i < 2; i++) + if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { +diff --git a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch +index 9c979c3e979..97073abff44 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch +@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell + + --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c + +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +-@@ -6844,8 +6844,6 @@ static void brcmf_cfg80211_reg_notifier( ++@@ -6854,8 +6854,6 @@ static void brcmf_cfg80211_reg_notifier( + /* ignore non-ISO3166 country codes */ + for (i = 0; i < 2; i++) + if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { +diff --git a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch +index 0e2657c4230..f91643342f8 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch +@@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell + + --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c + +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +-@@ -2149,7 +2149,7 @@ static void bcmgenet_init_tx_ring(struct ++@@ -2147,7 +2147,7 @@ static void bcmgenet_init_tx_ring(struct + + bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); + bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); +diff --git a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +index c29457500e2..02b5701099e 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +@@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell + + --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c + +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c +-@@ -285,6 +285,8 @@ int bcmgenet_mii_probe(struct net_device ++@@ -318,6 +318,8 @@ int bcmgenet_mii_probe(struct net_device + /* Communicate the integrated PHY revision */ + if (priv->internal_phy) + phy_flags = priv->gphy_rev; +diff --git a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch +index d7103c58225..655937e3036 100644 +--- a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch ++++ b/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch +@@ -28,7 +28,7 @@ compatibility for the device-tree configuration has been retained. + #define FSEL_REG(p) (GPFSEL0 + (((p) / 10) * 4)) + #define FSEL_SHIFT(p) (((p) % 10) * 3) + #define GPIO_REG_OFFSET(p) ((p) / 32) +-@@ -917,21 +923,45 @@ static void bcm2835_pull_config_set(stru ++@@ -915,21 +921,45 @@ static void bcm2835_pull_config_set(stru + unsigned int pin, unsigned int arg) + { + u32 off, bit; +diff --git a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch b/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch +deleted file mode 100644 +index d2fa02a957b..00000000000 +--- a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch ++++ /dev/null +@@ -1,20 +0,0 @@ +-From 95be54e285767c5209bb51df923373f78b8c4099 Mon Sep 17 00:00:00 2001 +-From: Linus Walleij +-Date: Mon, 16 Jul 2018 23:36:30 +0200 +-Subject: [PATCH 04/18] boot sq201 from sda1 +- +---- +- arch/arm/boot/dts/gemini-sq201.dts | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +---- a/arch/arm/boot/dts/gemini-sq201.dts +-+++ b/arch/arm/boot/dts/gemini-sq201.dts +-@@ -20,7 +20,7 @@ +- }; +- +- chosen { +-- bootargs = "console=ttyS0,115200n8"; +-+ bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait"; +- stdout-path = &uart0; +- }; +- +diff --git a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch +index 302945ff45e..92e2e65c71d 100644 +--- a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch ++++ b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch +@@ -121,7 +121,7 @@ Signed-off-by: Linus Walleij + /* 16MB of flash */ + reg = <0x30000000 0x01000000>; + +-@@ -184,9 +177,7 @@ ++@@ -157,9 +150,7 @@ + mux { + function = "gpio0"; + groups = "gpio0fgrp", +@@ -132,7 +132,7 @@ Signed-off-by: Linus Walleij + }; + }; + /* +-@@ -199,6 +190,18 @@ ++@@ -172,6 +163,18 @@ + groups = "gpio1dgrp"; + }; + }; + +diff --git a/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch b/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch +deleted file mode 100644 +index 7bd3ed9fad0..00000000000 +--- a/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch ++++ /dev/null +@@ -1,46 +0,0 @@ +-From d62e98ed1efcaa94caa004f622944afdce5f1c3c Mon Sep 17 00:00:00 2001 +-From: Gabor Juhos +-Date: Sun, 9 Dec 2018 18:12:13 +0100 +-Subject: [PATCH] ubifs: Fix default compression selection in ubifs +- +-When ubifs is build without the LZO compressor and no compressor is +-given the creation of the default file system will fail. before +-selection the LZO compressor check if it is present and if not fall back +-to the zlib or none. +- +-Signed-off-by: Gabor Juhos +-Signed-off-by: Hauke Mehrtens +-Signed-off-by: Richard Weinberger +---- +- fs/ubifs/sb.c | 13 ++++++++++++- +- 1 file changed, 12 insertions(+), 1 deletion(-) +- +---- a/fs/ubifs/sb.c +-+++ b/fs/ubifs/sb.c +-@@ -63,6 +63,17 @@ +- /* Default time granularity in nanoseconds */ +- #define DEFAULT_TIME_GRAN 1000000000 +- +-+static int get_default_compressor(struct ubifs_info *c) +-+{ +-+ if (ubifs_compr_present(c, UBIFS_COMPR_LZO)) +-+ return UBIFS_COMPR_LZO; +-+ +-+ if (ubifs_compr_present(c, UBIFS_COMPR_ZLIB)) +-+ return UBIFS_COMPR_ZLIB; +-+ +-+ return UBIFS_COMPR_NONE; +-+} +-+ +- /** +- * create_default_filesystem - format empty UBI volume. +- * @c: UBIFS file-system description object +-@@ -186,7 +197,7 @@ static int create_default_filesystem(str +- if (c->mount_opts.override_compr) +- sup->default_compr = cpu_to_le16(c->mount_opts.compr_type); +- else +-- sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO); +-+ sup->default_compr = cpu_to_le16(get_default_compressor(c)); +- +- generate_random_uuid(sup->uuid); +- +diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch +index ec976c165b3..4bd4d221688 100644 +--- a/target/linux/generic/hack-4.19/902-debloat_proc.patch ++++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch +@@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau + + --- a/net/core/sock.c + +++ b/net/core/sock.c +-@@ -3485,6 +3485,8 @@ static __net_initdata struct pernet_oper ++@@ -3486,6 +3486,8 @@ static __net_initdata struct pernet_oper + + static int __init proto_init(void) + { +diff --git a/target/linux/generic/hack-4.19/930-crashlog.patch b/target/linux/generic/hack-4.19/930-crashlog.patch +index 1562df44a45..bb16f22915f 100644 +--- a/target/linux/generic/hack-4.19/930-crashlog.patch ++++ b/target/linux/generic/hack-4.19/930-crashlog.patch +@@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau + help + --- a/kernel/Makefile + +++ b/kernel/Makefile +-@@ -117,6 +117,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o ++@@ -114,6 +114,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o + obj-$(CONFIG_HAS_IOMEM) += iomem.o + obj-$(CONFIG_ZONE_DEVICE) += memremap.o + obj-$(CONFIG_RSEQ) += rseq.o +diff --git a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +index 1a416e77827..ec541a865c8 100644 +--- a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch ++++ b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf + + --- a/mm/page_alloc.c + +++ b/mm/page_alloc.c +-@@ -6403,7 +6403,7 @@ static void __ref alloc_node_mem_map(str ++@@ -6400,7 +6400,7 @@ static void __ref alloc_node_mem_map(str + mem_map = NODE_DATA(0)->node_mem_map; + #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) + if (page_to_pfn(mem_map) != pgdat->node_start_pfn) +diff --git a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch +index e646224df28..bc783deb409 100644 +--- a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch ++++ b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch +@@ -59,15 +59,15 @@ Signed-off-by: Felix Fietkau + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve + * the pointer to that structure. +-@@ -623,6 +627,7 @@ int mtd_add_partition(struct mtd_info *p +- mutex_unlock(&mtd_partitions_mutex); ++@@ -626,6 +630,7 @@ int mtd_add_partition(struct mtd_info *p ++ if (ret) ++ goto err_remove_part; + +- add_mtd_device(&new->mtd); + + mtd_partition_split(parent, new); +- + mtd_add_partition_attrs(new); + +-@@ -701,6 +706,29 @@ int mtd_del_partition(struct mtd_info *m ++ return 0; ++@@ -712,6 +717,29 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -97,10 +97,10 @@ Signed-off-by: Felix Fietkau + /* + * This function, given a master MTD object and a partition table, creates + * and registers slave MTD objects which are bound to the master according to +-@@ -732,6 +760,7 @@ int add_mtd_partitions(struct mtd_info * +- mutex_unlock(&mtd_partitions_mutex); ++@@ -752,6 +780,7 @@ int add_mtd_partitions(struct mtd_info * ++ goto err_del_partitions; ++ } + +- add_mtd_device(&slave->mtd); + + mtd_partition_split(master, slave); + mtd_add_partition_attrs(slave); + /* Look for subpartitions */ +diff --git a/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch +index 4026a2050b9..a59659cda6a 100644 +--- a/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch ++++ b/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch +@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos + + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve +-@@ -706,6 +710,36 @@ int mtd_del_partition(struct mtd_info *m ++@@ -717,6 +721,36 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos + #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME + #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME + #else +-@@ -1041,6 +1075,61 @@ void mtd_part_parser_cleanup(struct mtd_ ++@@ -1066,6 +1100,61 @@ void mtd_part_parser_cleanup(struct mtd_ + } + } + +diff --git a/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +index 8a90ce6a8b7..58d2e445745 100644 +--- a/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch ++++ b/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -748,6 +748,7 @@ run_parsers_by_type(struct mtd_part *sla ++@@ -759,6 +759,7 @@ run_parsers_by_type(struct mtd_part *sla + + static void split_firmware(struct mtd_info *master, struct mtd_part *part) + { +@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos + } + + static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +-@@ -757,6 +758,12 @@ static void mtd_partition_split(struct m ++@@ -768,6 +769,12 @@ static void mtd_partition_split(struct m + if (rootfs_found) + return; + +diff --git a/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch +index 2e95e99f6d1..e404ec1fb27 100644 +--- a/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch ++++ b/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch +@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -1154,6 +1154,24 @@ int mtd_is_partition(const struct mtd_in ++@@ -1179,6 +1179,24 @@ int mtd_is_partition(const struct mtd_in + } + EXPORT_SYMBOL_GPL(mtd_is_partition); + +diff --git a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch +index 51af6b5d6b9..0750ab77c21 100644 +--- a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch ++++ b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch +@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz + help + --- a/init/main.c + +++ b/init/main.c +-@@ -366,6 +366,29 @@ static inline void setup_nr_cpu_ids(void ++@@ -365,6 +365,29 @@ static inline void setup_nr_cpu_ids(void + static inline void smp_prepare_cpus(unsigned int maxcpus) { } + #endif + +@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz + /* + * We need to store the untouched command line for future reference. + * We also need to store the touched command line since the parameter +-@@ -558,6 +581,7 @@ asmlinkage __visible void __init start_k ++@@ -557,6 +580,7 @@ asmlinkage __visible void __init start_k + add_device_randomness(command_line, strlen(command_line)); + boot_init_stack_canary(); + mm_init_cpumask(&init_mm); +diff --git a/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch b/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch +deleted file mode 100644 +index dde7b3f23b2..00000000000 +--- a/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch ++++ /dev/null +@@ -1,29 +0,0 @@ +-From 09bbf8c732e7a6ce290fc7c2d5a3e79ec6c3e8d2 Mon Sep 17 00:00:00 2001 +-From: Mathias Kresin +-Date: Wed, 3 Jul 2019 17:03:02 +0200 +-Subject: [PATCH] usb: dwc2: use a longer core rest timeout in +- dwc2_core_reset() +- +-Testing on different generations of Lantiq MIPS SoC based boards, showed +-that it takes up to 1500 us until the core reset bit is cleared. +- +-The driver from the vendor SDK (ifxhcd) uses a 1 second timeout. Use the +-same timeout to fix wrong hang detections and make the driver work for +-Lantiq MIPS SoCs. +- +-Signed-off-by: Mathias Kresin +---- +- drivers/usb/dwc2/core.c | 2 +- +- 1 file changed, 1 insertion(+), 1 deletion(-) +- +---- a/drivers/usb/dwc2/core.c +-+++ b/drivers/usb/dwc2/core.c +-@@ -524,7 +524,7 @@ int dwc2_core_reset(struct dwc2_hsotg *h +- greset |= GRSTCTL_CSFTRST; +- dwc2_writel(hsotg, greset, GRSTCTL); +- +-- if (dwc2_hsotg_wait_bit_clear(hsotg, GRSTCTL, GRSTCTL_CSFTRST, 50)) { +-+ if (dwc2_hsotg_wait_bit_clear(hsotg, GRSTCTL, GRSTCTL_CSFTRST, 10000)) { +- dev_warn(hsotg->dev, "%s: HANG! Soft Reset timeout GRSTCTL GRSTCTL_CSFTRST\n", +- __func__); +- return -EBUSY; +diff --git a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +index 6172e6fe450..0cb9e996027 100644 +--- a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch ++++ b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +@@ -180,7 +180,7 @@ Signed-off-by: Michael Gray + static int kernel_init(void *); + + extern void init_IRQ(void); +-@@ -592,6 +596,18 @@ asmlinkage __visible void __init start_k ++@@ -591,6 +595,18 @@ asmlinkage __visible void __init start_k + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.patch b/a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.patch new file mode 100644 index 0000000000..80cdc8ddcb --- /dev/null +++ b/a9b95921969eeb0b7b2271c95dd47a6a0c24a18a.patch @@ -0,0 +1,472 @@ +From a9b95921969eeb0b7b2271c95dd47a6a0c24a18a Mon Sep 17 00:00:00 2001 +From: Koen Vandeputte +Date: Fri, 6 Dec 2019 14:06:33 +0100 +Subject: [PATCH] kernel: bump 4.9 to 4.9.206 + +Refreshed all patches. + +Altered patches: +- 400-mtd-add-rootfs-split-support.patch + +Compile-tested on: none +Runtime-tested on: none + +Signed-off-by: Koen Vandeputte +--- + include/kernel-version.mk | 4 ++-- + ...rtitions-factor-out-code-calling-parser.patch | 4 ++-- + ...tions-add-helper-for-deleting-partition.patch | 4 ++-- + ...s-remove-sysfs-files-when-deleting-all-.patch | 4 ++-- + ...s-rename-master-to-the-parent-where-app.patch | 6 +++--- + ...artitions-add-support-for-subpartitions.patch | 8 ++++---- + ...tions-add-support-for-partition-parsers.patch | 4 ++-- + ...s-add-of_match_table-parser-matching-fo.patch | 4 ++-- + ...part-parser-to-fixed-partitions-as-it-f.patch | 4 ++-- + ...-adding-registering-partitions-to-the-p.patch | 6 +++--- + .../090-net-generalize-napi_complete_done.patch | 4 ++-- + ...s-use-DT-info-for-parsing-partitions-wi.patch | 10 +++++----- + ...add-generic-parsing-of-linux-part-probe.patch | 6 +++--- + .../400-mtd-add-rootfs-split-support.patch | 16 ++++++++-------- + ...rt-for-different-partition-parser-types.patch | 4 ++-- + ...d-parsers-for-rootfs-and-firmware-split.patch | 4 ++-- + .../404-mtd-add-more-helper-functions.patch | 2 +- + 17 files changed, 47 insertions(+), 47 deletions(-) + +diff --git a/include/kernel-version.mk b/include/kernel-version.mk +index 2f80a62e7e6..6a85c7a0b13 100644 +--- a/include/kernel-version.mk ++++ b/include/kernel-version.mk +@@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL + KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) + endif + +-LINUX_VERSION-4.9 = .205 ++LINUX_VERSION-4.9 = .206 + LINUX_VERSION-4.14 = .156 + LINUX_VERSION-4.19 = .86 + +-LINUX_KERNEL_HASH-4.9.205 = 98b9e8644706acc0cf51022372bb263b59a1d2bbe3ccd7ce6bd9bc7378c78b05 ++LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 + LINUX_KERNEL_HASH-4.14.156 = f8889feb0cbd7df36ff35bd4c72c1e2010567621bfcb218fcfa501bc5c7787c0 + LINUX_KERNEL_HASH-4.19.86 = bf2cbba319d43d1bd9e876ac0b55ab83118d1a1e61cce3c929d5371f7567bff6 + +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch +index d312e081a9d..70c1462d3fb 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch +@@ -18,7 +18,7 @@ Acked-by: Brian Norris + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -807,6 +807,27 @@ static const char * const default_mtd_pa ++@@ -832,6 +832,27 @@ static const char * const default_mtd_pa + NULL + }; + +@@ -46,7 +46,7 @@ Acked-by: Brian Norris + /** + * parse_mtd_partitions - parse MTD partitions + * @master: the master partition (describes whole MTD device) +-@@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info ++@@ -872,16 +893,10 @@ int parse_mtd_partitions(struct mtd_info + parser ? parser->name : NULL); + if (!parser) + continue; +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +index d93f4ba4b52..dea64a1f6d9 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +@@ -54,7 +54,7 @@ Signed-off-by: Brian Norris + static struct mtd_part *allocate_partition(struct mtd_info *master, + const struct mtd_partition *part, int partno, + uint64_t cur_offset) +-@@ -675,6 +649,48 @@ int mtd_add_partition(struct mtd_info *m ++@@ -686,6 +660,48 @@ err_remove_part: + } + EXPORT_SYMBOL_GPL(mtd_add_partition); + +@@ -103,7 +103,7 @@ Signed-off-by: Brian Norris + int mtd_del_partition(struct mtd_info *master, int partno) + { + struct mtd_part *slave, *next; +-@@ -686,12 +702,7 @@ int mtd_del_partition(struct mtd_info *m ++@@ -697,12 +713,7 @@ int mtd_del_partition(struct mtd_info *m + (slave->mtd.index == partno)) { + sysfs_remove_files(&slave->mtd.dev.kobj, + mtd_partition_attrs); +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch +index 0f1b502b70d..72edb25cc32 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch +@@ -25,7 +25,7 @@ Signed-off-by: Brian Norris + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -660,6 +660,8 @@ static int __mtd_del_partition(struct mt ++@@ -671,6 +671,8 @@ static int __mtd_del_partition(struct mt + { + int err; + +@@ -34,7 +34,7 @@ Signed-off-by: Brian Norris + err = del_mtd_device(&priv->mtd); + if (err) + return err; +-@@ -700,8 +702,6 @@ int mtd_del_partition(struct mtd_info *m ++@@ -711,8 +713,6 @@ int mtd_del_partition(struct mtd_info *m + list_for_each_entry_safe(slave, next, &mtd_partitions, list) + if ((slave->master == master) && + (slave->mtd.index == partno)) { +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch +index 79512276547..490eaa2e7ca 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch +@@ -578,7 +578,7 @@ Signed-off-by: Brian Norris + if (IS_ERR(new)) + return PTR_ERR(new); + +-@@ -683,7 +689,7 @@ int del_mtd_partitions(struct mtd_info * ++@@ -694,7 +700,7 @@ int del_mtd_partitions(struct mtd_info * + + mutex_lock(&mtd_partitions_mutex); + list_for_each_entry_safe(slave, next, &mtd_partitions, list) +@@ -587,7 +587,7 @@ Signed-off-by: Brian Norris + ret = __mtd_del_partition(slave); + if (ret < 0) + err = ret; +-@@ -700,7 +706,7 @@ int mtd_del_partition(struct mtd_info *m ++@@ -711,7 +717,7 @@ int mtd_del_partition(struct mtd_info *m + + mutex_lock(&mtd_partitions_mutex); + list_for_each_entry_safe(slave, next, &mtd_partitions, list) +@@ -596,7 +596,7 @@ Signed-off-by: Brian Norris + (slave->mtd.index == partno)) { + ret = __mtd_del_partition(slave); + break; +-@@ -933,6 +939,6 @@ uint64_t mtd_get_device_size(const struc ++@@ -958,6 +964,6 @@ uint64_t mtd_get_device_size(const struc + if (!mtd_is_partition(mtd)) + return mtd->size; + +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch +index 0d3e10ac201..578e59a8a1e 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch +@@ -31,7 +31,7 @@ Signed-off-by: Brian Norris + &parent->dev : + parent->dev.parent; + slave->mtd.dev.of_node = part->of_node; +-@@ -664,8 +664,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); ++@@ -675,8 +675,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); + */ + static int __mtd_del_partition(struct mtd_part *priv) + { +@@ -49,7 +49,7 @@ Signed-off-by: Brian Norris + sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs); + + err = del_mtd_device(&priv->mtd); +-@@ -680,16 +689,16 @@ static int __mtd_del_partition(struct mt ++@@ -691,16 +700,16 @@ static int __mtd_del_partition(struct mt + + /* + * This function unregisters and destroy all slave MTD objects which are +@@ -69,7 +69,7 @@ Signed-off-by: Brian Norris + ret = __mtd_del_partition(slave); + if (ret < 0) + err = ret; +-@@ -699,14 +708,14 @@ int del_mtd_partitions(struct mtd_info * ++@@ -710,14 +719,14 @@ int del_mtd_partitions(struct mtd_info * + return err; + } + +@@ -86,7 +86,7 @@ Signed-off-by: Brian Norris + (slave->mtd.index == partno)) { + ret = __mtd_del_partition(slave); + break; +-@@ -939,6 +948,6 @@ uint64_t mtd_get_device_size(const struc ++@@ -964,6 +973,6 @@ uint64_t mtd_get_device_size(const struc + if (!mtd_is_partition(mtd)) + return mtd->size; + +diff --git a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch +index a28ee316fac..c4c517f2384 100644 +--- a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch ++++ b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch +@@ -76,9 +76,9 @@ Signed-off-by: Brian Norris + static struct mtd_part *allocate_partition(struct mtd_info *parent, + const struct mtd_partition *part, int partno, + uint64_t cur_offset) +-@@ -758,6 +787,8 @@ int add_mtd_partitions(struct mtd_info * ++@@ -778,6 +807,8 @@ int add_mtd_partitions(struct mtd_info * ++ } + +- add_mtd_device(&slave->mtd); + mtd_add_partition_attrs(slave); + + if (parts[i].types) + + mtd_parse_part(slave, parts[i].types); +diff --git a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +index 60eace2a347..cb464996b7f 100644 +--- a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch ++++ b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +@@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon + + #include "mtdcore.h" + +-@@ -886,6 +887,92 @@ static int mtd_part_do_parse(struct mtd_ ++@@ -911,6 +912,92 @@ static int mtd_part_do_parse(struct mtd_ + } + + /** +@@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon + * parse_mtd_partitions - parse MTD partitions + * @master: the master partition (describes whole MTD device) + * @types: names of partition parsers to try or %NULL +-@@ -917,19 +1004,30 @@ int parse_mtd_partitions(struct mtd_info ++@@ -942,19 +1029,30 @@ int parse_mtd_partitions(struct mtd_info + types = default_mtd_part_types; + + for ( ; *types; types++) { +diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +index 59f53df1019..b22ddfabd8b 100644 +--- a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch ++++ b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +@@ -22,7 +22,7 @@ Signed-off-by: Boris Brezillon + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -932,7 +932,7 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -957,7 +957,7 @@ static int mtd_part_of_parse(struct mtd_ + struct device_node *np; + struct property *prop; + const char *compat; +@@ -31,7 +31,7 @@ Signed-off-by: Boris Brezillon + int ret, err = 0; + + np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); +-@@ -952,7 +952,7 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -977,7 +977,7 @@ static int mtd_part_of_parse(struct mtd_ + of_node_put(np); + + /* +diff --git a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch +index 29aa3b9e8d1..4bedd54a03f 100644 +--- a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch ++++ b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch +@@ -98,7 +98,7 @@ Signed-off-by: Boris Brezillon + } + + static struct mtd_part *allocate_partition(struct mtd_info *parent, +-@@ -973,30 +960,27 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -998,30 +985,27 @@ static int mtd_part_of_parse(struct mtd_ + } + + /** +@@ -136,7 +136,7 @@ Signed-off-by: Boris Brezillon + struct mtd_part_parser *parser; + int ret, err = 0; + +-@@ -1010,7 +994,7 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1035,7 +1019,7 @@ int parse_mtd_partitions(struct mtd_info + * handled in a separated function. + */ + if (!strcmp(*types, "ofpart")) { +@@ -145,7 +145,7 @@ Signed-off-by: Boris Brezillon + } else { + pr_debug("%s: parsing partitions %s\n", master->name, + *types); +-@@ -1021,13 +1005,17 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1046,13 +1030,17 @@ int parse_mtd_partitions(struct mtd_info + parser ? parser->name : NULL); + if (!parser) + continue; +diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +index 6052bf57773..d8d8ad5ea4f 100644 +--- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch ++++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller + + --- a/drivers/net/can/c_can/c_can.c + +++ b/drivers/net/can/c_can/c_can.c +-@@ -1079,7 +1079,7 @@ static int c_can_poll(struct napi_struct ++@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct + + end: + if (work_done < quota) { +@@ -313,7 +313,7 @@ Signed-off-by: David S. Miller + } + --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c + +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +-@@ -1532,7 +1532,7 @@ static int atl1e_clean(struct napi_struc ++@@ -1534,7 +1534,7 @@ static int atl1e_clean(struct napi_struc + /* If no Tx and not enough Rx work done, exit the polling mode */ + if (work_done < budget) { + quit_polling: +diff --git a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +index 4186f5599f1..758de9fdf3f 100644 +--- a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch ++++ b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +@@ -55,9 +55,9 @@ Signed-off-by: Boris Brezillon + static struct mtd_part *allocate_partition(struct mtd_info *parent, + const struct mtd_partition *part, int partno, + uint64_t cur_offset) +-@@ -775,8 +759,8 @@ int add_mtd_partitions(struct mtd_info * ++@@ -795,8 +779,8 @@ int add_mtd_partitions(struct mtd_info * ++ } + +- add_mtd_device(&slave->mtd); + mtd_add_partition_attrs(slave); + - if (parts[i].types) + - mtd_parse_part(slave, parts[i].types); +@@ -66,7 +66,7 @@ Signed-off-by: Boris Brezillon + + cur_offset = slave->offset + slave->mtd.size; + } +-@@ -852,6 +836,12 @@ static const char * const default_mtd_pa ++@@ -877,6 +861,12 @@ static const char * const default_mtd_pa + NULL + }; + +@@ -79,7 +79,7 @@ Signed-off-by: Boris Brezillon + static int mtd_part_do_parse(struct mtd_part_parser *parser, + struct mtd_info *master, + struct mtd_partitions *pparts, +-@@ -922,7 +912,9 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -947,7 +937,9 @@ static int mtd_part_of_parse(struct mtd_ + const char *fixed = "fixed-partitions"; + int ret, err = 0; + +@@ -90,7 +90,7 @@ Signed-off-by: Boris Brezillon + of_property_for_each_string(np, "compatible", prop, compat) { + parser = mtd_part_get_compatible_parser(compat); + if (!parser) +-@@ -985,7 +977,8 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1010,7 +1002,8 @@ int parse_mtd_partitions(struct mtd_info + int ret, err = 0; + + if (!types) +diff --git a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +index 64ed23170bb..11a33b7ebfd 100644 +--- a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch ++++ b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +@@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens + #include + #include + +-@@ -827,6 +828,42 @@ void deregister_mtd_parser(struct mtd_pa ++@@ -852,6 +853,42 @@ void deregister_mtd_parser(struct mtd_pa + EXPORT_SYMBOL_GPL(deregister_mtd_parser); + + /* +@@ -157,7 +157,7 @@ Signed-off-by: Hauke Mehrtens + * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you + * are changing this array! + */ +-@@ -975,6 +1012,13 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1000,6 +1037,13 @@ int parse_mtd_partitions(struct mtd_info + struct mtd_partitions pparts = { }; + struct mtd_part_parser *parser; + int ret, err = 0; +@@ -171,7 +171,7 @@ Signed-off-by: Hauke Mehrtens + + if (!types) + types = mtd_is_partition(master) ? default_subpartition_types : +-@@ -1016,6 +1060,7 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1041,6 +1085,7 @@ int parse_mtd_partitions(struct mtd_info + if (ret < 0 && !err) + err = ret; + } +diff --git a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch +index c9e3ca3713d..4369ed3f4ff 100644 +--- a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch ++++ b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch +@@ -60,15 +60,15 @@ Signed-off-by: Felix Fietkau + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve + * the pointer to that structure. +-@@ -650,6 +654,7 @@ int mtd_add_partition(struct mtd_info *p +- mutex_unlock(&mtd_partitions_mutex); ++@@ -653,6 +657,7 @@ int mtd_add_partition(struct mtd_info *p ++ if (ret) ++ goto err_remove_part; + +- add_mtd_device(&new->mtd); + + mtd_partition_split(parent, new); +- + mtd_add_partition_attrs(new); + +-@@ -728,6 +733,29 @@ int mtd_del_partition(struct mtd_info *m ++ return 0; ++@@ -739,6 +744,29 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -98,10 +98,10 @@ Signed-off-by: Felix Fietkau + /* + * This function, given a master MTD object and a partition table, creates + * and registers slave MTD objects which are bound to the master according to +-@@ -759,6 +787,7 @@ int add_mtd_partitions(struct mtd_info * +- mutex_unlock(&mtd_partitions_mutex); ++@@ -779,6 +807,7 @@ int add_mtd_partitions(struct mtd_info * ++ goto err_del_partitions; ++ } + +- add_mtd_device(&slave->mtd); + + mtd_partition_split(master, slave); + mtd_add_partition_attrs(slave); + /* Look for subpartitions */ +diff --git a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch +index 5a9d3f75608..eefba9f508d 100644 +--- a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch ++++ b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch +@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos + + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve +-@@ -733,6 +737,36 @@ int mtd_del_partition(struct mtd_info *m ++@@ -744,6 +748,36 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos + #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME + #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME + #else +-@@ -1109,6 +1143,61 @@ void mtd_part_parser_cleanup(struct mtd_ ++@@ -1134,6 +1168,61 @@ void mtd_part_parser_cleanup(struct mtd_ + } + } + +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 42d95360fd9..6085cb8ffb2 100644 +--- 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 +@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -775,6 +775,7 @@ run_parsers_by_type(struct mtd_part *sla ++@@ -786,6 +786,7 @@ run_parsers_by_type(struct mtd_part *sla + + static void split_firmware(struct mtd_info *master, struct mtd_part *part) + { +@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos + } + + static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +-@@ -784,6 +785,12 @@ static void mtd_partition_split(struct m ++@@ -795,6 +796,12 @@ static void mtd_partition_split(struct m + if (rootfs_found) + return; + +diff --git a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch +index b59977455e8..294a0f6f8b2 100644 +--- a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch ++++ b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch +@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -1222,6 +1222,24 @@ int mtd_is_partition(const struct mtd_in ++@@ -1247,6 +1247,24 @@ int mtd_is_partition(const struct mtd_in + } + EXPORT_SYMBOL_GPL(mtd_is_partition); + diff --git a/d395583d697c17f00a533d6efa13754c21630eda.patch b/d395583d697c17f00a533d6efa13754c21630eda.patch new file mode 100644 index 0000000000..b39082b69b --- /dev/null +++ b/d395583d697c17f00a533d6efa13754c21630eda.patch @@ -0,0 +1,452 @@ +From d395583d697c17f00a533d6efa13754c21630eda Mon Sep 17 00:00:00 2001 +From: Koen Vandeputte +Date: Fri, 6 Dec 2019 14:55:57 +0100 +Subject: [PATCH] kernel: bump 4.14 to 4.14.158 + +Refreshed all patches. + +Altered patches: +- 400-mtd-add-rootfs-split-support.patch + +Compile-tested on: cns3xxx +Runtime-tested on: cns3xxx + +Signed-off-by: Koen Vandeputte +--- + include/kernel-version.mk | 4 ++-- + .../910-unaligned_access_hacks.patch | 2 +- + .../910-unaligned_access_hacks.patch | 2 +- + ...l-option-fix-dwm-158-3g-modem-interface.patch | 2 +- + ...s-add-of_match_table-parser-matching-fo.patch | 4 ++-- + ...part-parser-to-fixed-partitions-as-it-f.patch | 4 ++-- + ...-adding-registering-partitions-to-the-p.patch | 6 +++--- + ...s-use-DT-info-for-parsing-partitions-wi.patch | 10 +++++----- + .../linux/generic/hack-4.14/930-crashlog.patch | 2 +- + ...add-generic-parsing-of-linux-part-probe.patch | 6 +++--- + .../400-mtd-add-rootfs-split-support.patch | 16 ++++++++-------- + ...rt-for-different-partition-parser-types.patch | 4 ++-- + ...d-parsers-for-rootfs-and-firmware-split.patch | 4 ++-- + .../404-mtd-add-more-helper-functions.patch | 2 +- + .../pending-4.14/920-mangle_bootargs.patch | 4 ++-- + ...ic-Mangle-bootloader-s-kernel-arguments.patch | 2 +- + .../202-core-linux-support-layerscape.patch | 2 +- + ...bu-Mangle-bootloader-s-kernel-arguments.patch | 2 +- + ...ic-Mangle-bootloader-s-kernel-arguments.patch | 2 +- + .../0031-uvc-add-iPassion-iP2970-support.patch | 2 +- + .../patches-4.14/0200-linkit_bootstrap.patch | 2 +- + 21 files changed, 42 insertions(+), 42 deletions(-) + +diff --git a/include/kernel-version.mk b/include/kernel-version.mk +index 6a85c7a0b13..9a70b4cdd81 100644 +--- a/include/kernel-version.mk ++++ b/include/kernel-version.mk +@@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL + endif + + LINUX_VERSION-4.9 = .206 +-LINUX_VERSION-4.14 = .156 ++LINUX_VERSION-4.14 = .158 + LINUX_VERSION-4.19 = .86 + + LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 +-LINUX_KERNEL_HASH-4.14.156 = f8889feb0cbd7df36ff35bd4c72c1e2010567621bfcb218fcfa501bc5c7787c0 ++LINUX_KERNEL_HASH-4.14.158 = 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 + LINUX_KERNEL_HASH-4.19.86 = bf2cbba319d43d1bd9e876ac0b55ab83118d1a1e61cce3c929d5371f7567bff6 + + remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) +diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +index fbad39a5cc4..9d1e4e524e4 100644 +--- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch ++++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +@@ -223,7 +223,7 @@ + #include + #include + #include +-@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s ++@@ -820,10 +821,10 @@ static void tcp_v6_send_response(const s + topt = (__be32 *)(t1 + 1); + + if (tsecr) { +diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +index 5d9b84eb9f3..17ee82fe793 100644 +--- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch ++++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +@@ -214,7 +214,7 @@ + #include + #include + #include +-@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s ++@@ -820,10 +821,10 @@ static void tcp_v6_send_response(const s + topt = (__be32 *)(t1 + 1); + + if (tsecr) { +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 b708fda5ca1..817b112f902 100644 +--- 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 + + --- a/drivers/usb/serial/option.c + +++ b/drivers/usb/serial/option.c +-@@ -1965,7 +1965,8 @@ static const struct usb_device_id option ++@@ -1968,7 +1968,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/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +index bd39a2625e8..765b6b95dfb 100644 +--- a/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch ++++ b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +@@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon + + #include "mtdcore.h" + +-@@ -894,6 +895,92 @@ static int mtd_part_do_parse(struct mtd_ ++@@ -919,6 +920,92 @@ static int mtd_part_do_parse(struct mtd_ + } + + /** +@@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon + * parse_mtd_partitions - parse MTD partitions + * @master: the master partition (describes whole MTD device) + * @types: names of partition parsers to try or %NULL +-@@ -925,19 +1012,30 @@ int parse_mtd_partitions(struct mtd_info ++@@ -950,19 +1037,30 @@ int parse_mtd_partitions(struct mtd_info + types = default_mtd_part_types; + + for ( ; *types; types++) { +diff --git a/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +index 66b67d76763..22ad40bf445 100644 +--- a/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch ++++ b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +@@ -22,7 +22,7 @@ Signed-off-by: Boris Brezillon + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -940,7 +940,7 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -965,7 +965,7 @@ static int mtd_part_of_parse(struct mtd_ + struct device_node *np; + struct property *prop; + const char *compat; +@@ -31,7 +31,7 @@ Signed-off-by: Boris Brezillon + int ret, err = 0; + + np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); +-@@ -960,7 +960,7 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -985,7 +985,7 @@ static int mtd_part_of_parse(struct mtd_ + of_node_put(np); + + /* +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 83077431b88..d017fd452b7 100644 +--- 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 +@@ -98,7 +98,7 @@ Signed-off-by: Boris Brezillon + } + + static struct mtd_part *allocate_partition(struct mtd_info *parent, +-@@ -981,30 +968,27 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -1006,30 +993,27 @@ static int mtd_part_of_parse(struct mtd_ + } + + /** +@@ -136,7 +136,7 @@ Signed-off-by: Boris Brezillon + struct mtd_part_parser *parser; + int ret, err = 0; + +-@@ -1018,7 +1002,7 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1043,7 +1027,7 @@ int parse_mtd_partitions(struct mtd_info + * handled in a separated function. + */ + if (!strcmp(*types, "ofpart")) { +@@ -145,7 +145,7 @@ Signed-off-by: Boris Brezillon + } else { + pr_debug("%s: parsing partitions %s\n", master->name, + *types); +-@@ -1029,13 +1013,17 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1054,13 +1038,17 @@ int parse_mtd_partitions(struct mtd_info + parser ? parser->name : NULL); + if (!parser) + continue; +diff --git a/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +index 1bb3563f15f..eff1a016922 100644 +--- a/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch ++++ b/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +@@ -55,9 +55,9 @@ Signed-off-by: Boris Brezillon + static struct mtd_part *allocate_partition(struct mtd_info *parent, + const struct mtd_partition *part, int partno, + uint64_t cur_offset) +-@@ -783,8 +767,8 @@ int add_mtd_partitions(struct mtd_info * ++@@ -803,8 +787,8 @@ int add_mtd_partitions(struct mtd_info * ++ } + +- add_mtd_device(&slave->mtd); + mtd_add_partition_attrs(slave); + - if (parts[i].types) + - mtd_parse_part(slave, parts[i].types); +@@ -66,7 +66,7 @@ Signed-off-by: Boris Brezillon + + cur_offset = slave->offset + slave->mtd.size; + } +-@@ -860,6 +844,12 @@ static const char * const default_mtd_pa ++@@ -885,6 +869,12 @@ static const char * const default_mtd_pa + NULL + }; + +@@ -79,7 +79,7 @@ Signed-off-by: Boris Brezillon + static int mtd_part_do_parse(struct mtd_part_parser *parser, + struct mtd_info *master, + struct mtd_partitions *pparts, +-@@ -930,7 +920,9 @@ static int mtd_part_of_parse(struct mtd_ ++@@ -955,7 +945,9 @@ static int mtd_part_of_parse(struct mtd_ + const char *fixed = "fixed-partitions"; + int ret, err = 0; + +@@ -90,7 +90,7 @@ Signed-off-by: Boris Brezillon + of_property_for_each_string(np, "compatible", prop, compat) { + parser = mtd_part_get_compatible_parser(compat); + if (!parser) +-@@ -993,7 +985,8 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1018,7 +1010,8 @@ int parse_mtd_partitions(struct mtd_info + int ret, err = 0; + + if (!types) +diff --git a/target/linux/generic/hack-4.14/930-crashlog.patch b/target/linux/generic/hack-4.14/930-crashlog.patch +index 1479a4c06d0..9d09dbd760a 100644 +--- a/target/linux/generic/hack-4.14/930-crashlog.patch ++++ b/target/linux/generic/hack-4.14/930-crashlog.patch +@@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau + depends on BROKEN || !FRV + --- a/kernel/Makefile + +++ b/kernel/Makefile +-@@ -113,6 +113,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex ++@@ -110,6 +110,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex + obj-$(CONFIG_TORTURE_TEST) += torture.o + + obj-$(CONFIG_HAS_IOMEM) += memremap.o +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 5e70756c4e3..bf0c2892276 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 +@@ -110,7 +110,7 @@ Signed-off-by: Hauke Mehrtens + #include + #include + +-@@ -844,6 +845,37 @@ void deregister_mtd_parser(struct mtd_pa ++@@ -869,6 +870,37 @@ void deregister_mtd_parser(struct mtd_pa + } + EXPORT_SYMBOL_GPL(deregister_mtd_parser); + +@@ -148,7 +148,7 @@ Signed-off-by: Hauke Mehrtens + /* + * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you + * are changing this array! +-@@ -993,6 +1025,13 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1018,6 +1050,13 @@ int parse_mtd_partitions(struct mtd_info + struct mtd_partitions pparts = { }; + struct mtd_part_parser *parser; + int ret, err = 0; +@@ -162,7 +162,7 @@ Signed-off-by: Hauke Mehrtens + + if (!types) + types = mtd_is_partition(master) ? default_subpartition_types : +-@@ -1034,6 +1073,7 @@ int parse_mtd_partitions(struct mtd_info ++@@ -1059,6 +1098,7 @@ int parse_mtd_partitions(struct mtd_info + if (ret < 0 && !err) + err = ret; + } +diff --git a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch +index 5f8899ea619..10ad99585de 100644 +--- a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch ++++ b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch +@@ -60,15 +60,15 @@ Signed-off-by: Felix Fietkau + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve + * the pointer to that structure. +-@@ -668,6 +672,7 @@ int mtd_add_partition(struct mtd_info *p +- mutex_unlock(&mtd_partitions_mutex); ++@@ -671,6 +675,7 @@ int mtd_add_partition(struct mtd_info *p ++ if (ret) ++ goto err_remove_part; + +- add_mtd_device(&new->mtd); + + mtd_partition_split(parent, new); +- + mtd_add_partition_attrs(new); + +-@@ -746,6 +751,29 @@ int mtd_del_partition(struct mtd_info *m ++ return 0; ++@@ -757,6 +762,29 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -98,10 +98,10 @@ Signed-off-by: Felix Fietkau + /* + * This function, given a master MTD object and a partition table, creates + * and registers slave MTD objects which are bound to the master according to +-@@ -777,6 +805,7 @@ int add_mtd_partitions(struct mtd_info * +- mutex_unlock(&mtd_partitions_mutex); ++@@ -797,6 +825,7 @@ int add_mtd_partitions(struct mtd_info * ++ goto err_del_partitions; ++ } + +- add_mtd_device(&slave->mtd); + + mtd_partition_split(master, slave); + mtd_add_partition_attrs(slave); + /* Look for subpartitions */ +diff --git a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch +index 359c4c167bb..057d4736844 100644 +--- a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch ++++ b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch +@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos + + /* + * Given a pointer to the MTD object in the mtd_part structure, we can retrieve +-@@ -751,6 +755,36 @@ int mtd_del_partition(struct mtd_info *m ++@@ -762,6 +766,36 @@ int mtd_del_partition(struct mtd_info *m + } + EXPORT_SYMBOL_GPL(mtd_del_partition); + +@@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos + #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME + #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME + #else +-@@ -1122,6 +1156,61 @@ void mtd_part_parser_cleanup(struct mtd_ ++@@ -1147,6 +1181,61 @@ void mtd_part_parser_cleanup(struct mtd_ + } + } + +diff --git a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +index e8706633554..2cc06dd463b 100644 +--- a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch ++++ b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -793,6 +793,7 @@ run_parsers_by_type(struct mtd_part *sla ++@@ -804,6 +804,7 @@ run_parsers_by_type(struct mtd_part *sla + + static void split_firmware(struct mtd_info *master, struct mtd_part *part) + { +@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos + } + + static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +-@@ -802,6 +803,12 @@ static void mtd_partition_split(struct m ++@@ -813,6 +814,12 @@ static void mtd_partition_split(struct m + if (rootfs_found) + return; + +diff --git a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch +index 94c59df01dc..7b481ffb47a 100644 +--- a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch ++++ b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch +@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos + + --- a/drivers/mtd/mtdpart.c + +++ b/drivers/mtd/mtdpart.c +-@@ -1235,6 +1235,24 @@ int mtd_is_partition(const struct mtd_in ++@@ -1260,6 +1260,24 @@ int mtd_is_partition(const struct mtd_in + } + EXPORT_SYMBOL_GPL(mtd_is_partition); + +diff --git a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch +index adeb9f12f93..2f6a52c23d6 100644 +--- a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch ++++ b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch +@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz + help + --- a/init/main.c + +++ b/init/main.c +-@@ -359,6 +359,29 @@ static inline void setup_nr_cpu_ids(void ++@@ -358,6 +358,29 @@ static inline void setup_nr_cpu_ids(void + static inline void smp_prepare_cpus(unsigned int maxcpus) { } + #endif + +@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz + /* + * We need to store the untouched command line for future reference. + * We also need to store the touched command line since the parameter +-@@ -540,6 +563,7 @@ asmlinkage __visible void __init start_k ++@@ -539,6 +562,7 @@ asmlinkage __visible void __init start_k + add_device_randomness(command_line, strlen(command_line)); + boot_init_stack_canary(); + mm_init_cpumask(&init_mm); +diff --git a/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +index b6f1f47424d..5d3243ccb4d 100644 +--- a/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch ++++ b/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella + static int kernel_init(void *); + + extern void init_IRQ(void); +-@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k ++@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); +diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +index 49e528402c6..7be95d49e40 100644 +--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch ++++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +@@ -321,7 +321,7 @@ Signed-off-by: Yangbo Lu + } else if (has_acpi_companion(dma_dev)) { + --- a/drivers/gpu/ipu-v3/ipu-pre.c + +++ b/drivers/gpu/ipu-v3/ipu-pre.c +-@@ -124,7 +124,8 @@ ipu_pre_lookup_by_phandle(struct device ++@@ -125,7 +125,8 @@ ipu_pre_lookup_by_phandle(struct device + list_for_each_entry(pre, &ipu_pre_list, list) { + if (pre_node == pre->dev->of_node) { + mutex_unlock(&ipu_pre_list_mutex); +diff --git a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +index d15794f2e3e..8f11632d04a 100644 +--- a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch ++++ b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +@@ -180,7 +180,7 @@ Signed-off-by: Michael Gray + static int kernel_init(void *); + + extern void init_IRQ(void); +-@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k ++@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); +diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch +index 3758ca0dc3a..d3b047f3c4f 100644 +--- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch ++++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch +@@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella + static int kernel_init(void *); + + extern void init_IRQ(void); +-@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k ++@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); +diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch +index ff4c5b17fa0..0b305a8105d 100644 +--- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch ++++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch +@@ -13,7 +13,7 @@ Signed-off-by: John Crispin + + --- a/drivers/media/usb/uvc/uvc_driver.c + +++ b/drivers/media/usb/uvc/uvc_driver.c +-@@ -2735,6 +2735,18 @@ static const struct usb_device_id uvc_id ++@@ -2737,6 +2737,18 @@ static const struct usb_device_id uvc_id + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_QUIRK_FORCE_Y8 }, +diff --git a/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch b/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch +index 865ae79f43e..cd1462fbcff 100644 +--- a/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch ++++ b/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch +@@ -1,6 +1,6 @@ + --- a/drivers/misc/Makefile + +++ b/drivers/misc/Makefile +-@@ -57,6 +57,7 @@ obj-$(CONFIG_CXL_BASE) += cxl/ ++@@ -56,6 +56,7 @@ obj-$(CONFIG_CXL_BASE) += cxl/ + obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o + obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o + obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e07eeeeabf..375f76d87d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .205 -LINUX_VERSION-4.14 = .156 -LINUX_VERSION-4.19 = .86 +LINUX_VERSION-4.9 = .206 +LINUX_VERSION-4.14 = .158 +LINUX_VERSION-4.19 = .88 -LINUX_KERNEL_HASH-4.9.205 = 98b9e8644706acc0cf51022372bb263b59a1d2bbe3ccd7ce6bd9bc7378c78b05 -LINUX_KERNEL_HASH-4.14.156 = f8889feb0cbd7df36ff35bd4c72c1e2010567621bfcb218fcfa501bc5c7787c0 -LINUX_KERNEL_HASH-4.19.86 = bf2cbba319d43d1bd9e876ac0b55ab83118d1a1e61cce3c929d5371f7567bff6 +LINUX_KERNEL_HASH-4.9.206 = 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 +LINUX_KERNEL_HASH-4.14.158 = 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 +LINUX_KERNEL_HASH-4.19.88 = c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe 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/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 99efbb57d8..b49d73b1f6 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s +@@ -820,10 +821,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index 5d9b84eb9f..17ee82fe79 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s +@@ -820,10 +821,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index ad7b12d650..7784801c8c 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -836,10 +837,10 @@ static void tcp_v6_send_response(const s +@@ -837,10 +838,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { diff --git a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch index cfc52ead26..f08379057f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch +++ b/target/linux/brcm2708/patches-4.19/950-0030-mm-Remove-the-PFN-busy-warning.patch @@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -7980,8 +7980,6 @@ int alloc_contig_range(unsigned long sta +@@ -7977,8 +7977,6 @@ int alloc_contig_range(unsigned long sta /* Make sure the range is really isolated. */ if (test_pages_isolated(outer_start, end, false)) { diff --git a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch index e3aeded95c..307e82ede4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch +++ b/target/linux/brcm2708/patches-4.19/950-0038-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch @@ -11,7 +11,7 @@ Signed-off-by: Noralf Tronnes --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -@@ -352,7 +352,7 @@ static const struct gpio_chip bcm2835_gp +@@ -350,7 +350,7 @@ static const struct gpio_chip bcm2835_gp .get_direction = bcm2835_gpio_get_direction, .get = bcm2835_gpio_get, .set = bcm2835_gpio_set, diff --git a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch index af67d42f8d..25f587b2d7 100644 --- a/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/brcm2708/patches-4.19/950-0044-MMC-added-alternative-MMC-driver.patch @@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2919,6 +2926,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2913,6 +2920,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -133,7 +133,7 @@ Signed-off-by: Phil Elwell /* * Check that the card supports the command class(es) we need. -@@ -2926,7 +2934,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2920,7 +2928,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -151,7 +151,7 @@ Signed-off-by: Phil Elwell card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2941,9 +2958,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2935,9 +2952,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); diff --git a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch b/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch index d61948995c..4251ecafef 100644 --- a/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch +++ b/target/linux/brcm2708/patches-4.19/950-0093-brcm-adds-support-for-BCM43341-wifi.patch @@ -57,7 +57,7 @@ Signed-off-by: Phil Elwell cfg->pwr_save = enabled; if (!check_vif_up(ifp->vif)) { -@@ -6776,12 +6778,18 @@ static s32 brcmf_translate_country_code( +@@ -6786,12 +6788,18 @@ static s32 brcmf_translate_country_code( struct brcmfmac_pd_cc *country_codes; struct brcmfmac_pd_cc_entry *cc; s32 found_index; @@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell } if ((alpha2[0] == ccreq->country_abbrev[0]) && -@@ -6805,10 +6813,14 @@ static s32 brcmf_translate_country_code( +@@ -6815,10 +6823,14 @@ static s32 brcmf_translate_country_code( brcmf_dbg(TRACE, "No country code match found\n"); return -EINVAL; } @@ -109,7 +109,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -608,6 +608,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); +@@ -614,6 +614,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); BRCMF_FW_DEF(4330, "brcmfmac4330-sdio"); BRCMF_FW_DEF(4334, "brcmfmac4334-sdio"); BRCMF_FW_DEF(43340, "brcmfmac43340-sdio"); @@ -117,7 +117,7 @@ Signed-off-by: Phil Elwell BRCMF_FW_DEF(4335, "brcmfmac4335-sdio"); BRCMF_FW_DEF(43362, "brcmfmac43362-sdio"); BRCMF_FW_DEF(4339, "brcmfmac4339-sdio"); -@@ -628,7 +629,7 @@ static const struct brcmf_firmware_mappi +@@ -634,7 +635,7 @@ static const struct brcmf_firmware_mappi BRCMF_FW_ENTRY(BRCM_CC_4330_CHIP_ID, 0xFFFFFFFF, 4330), BRCMF_FW_ENTRY(BRCM_CC_4334_CHIP_ID, 0xFFFFFFFF, 4334), BRCMF_FW_ENTRY(BRCM_CC_43340_CHIP_ID, 0xFFFFFFFF, 43340), diff --git a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch index 27e6a201a5..8111f9d42c 100644 --- a/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch +++ b/target/linux/brcm2708/patches-4.19/950-0094-brcmfmac-Mute-expected-startup-errors.patch @@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6844,6 +6844,8 @@ static void brcmf_cfg80211_reg_notifier( +@@ -6854,6 +6854,8 @@ static void brcmf_cfg80211_reg_notifier( /* ignore non-ISO3166 country codes */ for (i = 0; i < 2; i++) if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { diff --git a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch b/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch index 9c979c3e97..97073abff4 100644 --- a/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch +++ b/target/linux/brcm2708/patches-4.19/950-0349-Revert-brcmfmac-Mute-expected-startup-errors.patch @@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -6844,8 +6844,6 @@ static void brcmf_cfg80211_reg_notifier( +@@ -6854,8 +6854,6 @@ static void brcmf_cfg80211_reg_notifier( /* ignore non-ISO3166 country codes */ for (i = 0; i < 2; i++) if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') { diff --git a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch index 0e2657c423..f91643342f 100644 --- a/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/brcm2708/patches-4.19/950-0541-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2149,7 +2149,7 @@ static void bcmgenet_init_tx_ring(struct +@@ -2147,7 +2147,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); diff --git a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch index c29457500e..02b5701099 100644 --- a/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch +++ b/target/linux/brcm2708/patches-4.19/950-0542-net-genet-enable-link-energy-detect-powerdown-for-ex.patch @@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c -@@ -285,6 +285,8 @@ int bcmgenet_mii_probe(struct net_device +@@ -318,6 +318,8 @@ int bcmgenet_mii_probe(struct net_device /* Communicate the integrated PHY revision */ if (priv->internal_phy) phy_flags = priv->gphy_rev; diff --git a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch b/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch index d7103c5822..655937e303 100644 --- a/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch +++ b/target/linux/brcm2708/patches-4.19/950-0549-pinctrl-bcm2835-Add-support-for-BCM2838.patch @@ -28,7 +28,7 @@ compatibility for the device-tree configuration has been retained. #define FSEL_REG(p) (GPFSEL0 + (((p) / 10) * 4)) #define FSEL_SHIFT(p) (((p) % 10) * 3) #define GPIO_REG_OFFSET(p) ((p) / 32) -@@ -917,21 +923,45 @@ static void bcm2835_pull_config_set(stru +@@ -915,21 +921,45 @@ static void bcm2835_pull_config_set(stru unsigned int pin, unsigned int arg) { u32 off, bit; diff --git a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch b/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch deleted file mode 100644 index d2fa02a957..0000000000 --- a/target/linux/gemini/patches-4.19/0004-boot-sq201-from-sda1.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 95be54e285767c5209bb51df923373f78b8c4099 Mon Sep 17 00:00:00 2001 -From: Linus Walleij -Date: Mon, 16 Jul 2018 23:36:30 +0200 -Subject: [PATCH 04/18] boot sq201 from sda1 - ---- - arch/arm/boot/dts/gemini-sq201.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/gemini-sq201.dts -+++ b/arch/arm/boot/dts/gemini-sq201.dts -@@ -20,7 +20,7 @@ - }; - - chosen { -- bootargs = "console=ttyS0,115200n8"; -+ bootargs = "console=ttyS0,115200n8 root=/dev/sda1 rw rootwait"; - stdout-path = &uart0; - }; - diff --git a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch index fab00d25e5..3e518238ea 100644 --- a/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch +++ b/target/linux/gemini/patches-4.19/0008-ARM-dts-Enable-Gemini-flash-access.patch @@ -130,7 +130,7 @@ Signed-off-by: Linus Walleij /* 16MB of flash */ reg = <0x30000000 0x01000000>; -@@ -184,9 +177,7 @@ +@@ -157,9 +150,7 @@ mux { function = "gpio0"; groups = "gpio0fgrp", @@ -141,7 +141,7 @@ Signed-off-by: Linus Walleij }; }; /* -@@ -199,6 +190,18 @@ +@@ -172,6 +163,18 @@ groups = "gpio1dgrp"; }; }; 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 b708fda5ca..817b112f90 100644 --- 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 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1965,7 +1965,8 @@ static const struct usb_device_id option +@@ -1968,7 +1968,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/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch index bd39a2625e..765b6b95df 100644 --- a/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch @@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon #include "mtdcore.h" -@@ -894,6 +895,92 @@ static int mtd_part_do_parse(struct mtd_ +@@ -919,6 +920,92 @@ static int mtd_part_do_parse(struct mtd_ } /** @@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) * @types: names of partition parsers to try or %NULL -@@ -925,19 +1012,30 @@ int parse_mtd_partitions(struct mtd_info +@@ -950,19 +1037,30 @@ int parse_mtd_partitions(struct mtd_info types = default_mtd_part_types; for ( ; *types; types++) { diff --git a/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch index 66b67d7676..22ad40bf44 100644 --- a/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch @@ -22,7 +22,7 @@ Signed-off-by: Boris Brezillon --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -940,7 +940,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -965,7 +965,7 @@ static int mtd_part_of_parse(struct mtd_ struct device_node *np; struct property *prop; const char *compat; @@ -31,7 +31,7 @@ Signed-off-by: Boris Brezillon int ret, err = 0; np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -@@ -960,7 +960,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -985,7 +985,7 @@ static int mtd_part_of_parse(struct mtd_ of_node_put(np); /* 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 83077431b8..d017fd452b 100644 --- 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 @@ -98,7 +98,7 @@ Signed-off-by: Boris Brezillon } static struct mtd_part *allocate_partition(struct mtd_info *parent, -@@ -981,30 +968,27 @@ static int mtd_part_of_parse(struct mtd_ +@@ -1006,30 +993,27 @@ static int mtd_part_of_parse(struct mtd_ } /** @@ -136,7 +136,7 @@ Signed-off-by: Boris Brezillon struct mtd_part_parser *parser; int ret, err = 0; -@@ -1018,7 +1002,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1043,7 +1027,7 @@ int parse_mtd_partitions(struct mtd_info * handled in a separated function. */ if (!strcmp(*types, "ofpart")) { @@ -145,7 +145,7 @@ Signed-off-by: Boris Brezillon } else { pr_debug("%s: parsing partitions %s\n", master->name, *types); -@@ -1029,13 +1013,17 @@ int parse_mtd_partitions(struct mtd_info +@@ -1054,13 +1038,17 @@ int parse_mtd_partitions(struct mtd_info parser ? parser->name : NULL); if (!parser) continue; diff --git a/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch index 1bb3563f15..eff1a01692 100644 --- a/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +++ b/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch @@ -55,9 +55,9 @@ Signed-off-by: Boris Brezillon static struct mtd_part *allocate_partition(struct mtd_info *parent, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -783,8 +767,8 @@ int add_mtd_partitions(struct mtd_info * +@@ -803,8 +787,8 @@ int add_mtd_partitions(struct mtd_info * + } - add_mtd_device(&slave->mtd); mtd_add_partition_attrs(slave); - if (parts[i].types) - mtd_parse_part(slave, parts[i].types); @@ -66,7 +66,7 @@ Signed-off-by: Boris Brezillon cur_offset = slave->offset + slave->mtd.size; } -@@ -860,6 +844,12 @@ static const char * const default_mtd_pa +@@ -885,6 +869,12 @@ static const char * const default_mtd_pa NULL }; @@ -79,7 +79,7 @@ Signed-off-by: Boris Brezillon static int mtd_part_do_parse(struct mtd_part_parser *parser, struct mtd_info *master, struct mtd_partitions *pparts, -@@ -930,7 +920,9 @@ static int mtd_part_of_parse(struct mtd_ +@@ -955,7 +945,9 @@ static int mtd_part_of_parse(struct mtd_ const char *fixed = "fixed-partitions"; int ret, err = 0; @@ -90,7 +90,7 @@ Signed-off-by: Boris Brezillon of_property_for_each_string(np, "compatible", prop, compat) { parser = mtd_part_get_compatible_parser(compat); if (!parser) -@@ -993,7 +985,8 @@ int parse_mtd_partitions(struct mtd_info +@@ -1018,7 +1010,8 @@ int parse_mtd_partitions(struct mtd_info int ret, err = 0; if (!types) diff --git a/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch b/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch deleted file mode 100644 index 7bd3ed9fad..0000000000 --- a/target/linux/generic/backport-4.19/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d62e98ed1efcaa94caa004f622944afdce5f1c3c Mon Sep 17 00:00:00 2001 -From: Gabor Juhos -Date: Sun, 9 Dec 2018 18:12:13 +0100 -Subject: [PATCH] ubifs: Fix default compression selection in ubifs - -When ubifs is build without the LZO compressor and no compressor is -given the creation of the default file system will fail. before -selection the LZO compressor check if it is present and if not fall back -to the zlib or none. - -Signed-off-by: Gabor Juhos -Signed-off-by: Hauke Mehrtens -Signed-off-by: Richard Weinberger ---- - fs/ubifs/sb.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/fs/ubifs/sb.c -+++ b/fs/ubifs/sb.c -@@ -63,6 +63,17 @@ - /* Default time granularity in nanoseconds */ - #define DEFAULT_TIME_GRAN 1000000000 - -+static int get_default_compressor(struct ubifs_info *c) -+{ -+ if (ubifs_compr_present(c, UBIFS_COMPR_LZO)) -+ return UBIFS_COMPR_LZO; -+ -+ if (ubifs_compr_present(c, UBIFS_COMPR_ZLIB)) -+ return UBIFS_COMPR_ZLIB; -+ -+ return UBIFS_COMPR_NONE; -+} -+ - /** - * create_default_filesystem - format empty UBI volume. - * @c: UBIFS file-system description object -@@ -186,7 +197,7 @@ static int create_default_filesystem(str - if (c->mount_opts.override_compr) - sup->default_compr = cpu_to_le16(c->mount_opts.compr_type); - else -- sup->default_compr = cpu_to_le16(UBIFS_COMPR_LZO); -+ sup->default_compr = cpu_to_le16(get_default_compressor(c)); - - generate_random_uuid(sup->uuid); - diff --git a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch index d312e081a9..70c1462d3f 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0002-mtd-partitions-factor-out-code-calling-parser.patch @@ -18,7 +18,7 @@ Acked-by: Brian Norris --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -807,6 +807,27 @@ static const char * const default_mtd_pa +@@ -832,6 +832,27 @@ static const char * const default_mtd_pa NULL }; @@ -46,7 +46,7 @@ Acked-by: Brian Norris /** * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) -@@ -847,16 +868,10 @@ int parse_mtd_partitions(struct mtd_info +@@ -872,16 +893,10 @@ int parse_mtd_partitions(struct mtd_info parser ? parser->name : NULL); if (!parser) continue; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch index d93f4ba4b5..dea64a1f6d 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch @@ -54,7 +54,7 @@ Signed-off-by: Brian Norris static struct mtd_part *allocate_partition(struct mtd_info *master, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -675,6 +649,48 @@ int mtd_add_partition(struct mtd_info *m +@@ -686,6 +660,48 @@ err_remove_part: } EXPORT_SYMBOL_GPL(mtd_add_partition); @@ -103,7 +103,7 @@ Signed-off-by: Brian Norris int mtd_del_partition(struct mtd_info *master, int partno) { struct mtd_part *slave, *next; -@@ -686,12 +702,7 @@ int mtd_del_partition(struct mtd_info *m +@@ -697,12 +713,7 @@ int mtd_del_partition(struct mtd_info *m (slave->mtd.index == partno)) { sysfs_remove_files(&slave->mtd.dev.kobj, mtd_partition_attrs); diff --git a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch index 0f1b502b70..72edb25cc3 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0004-mtd-partitions-remove-sysfs-files-when-deleting-all-.patch @@ -25,7 +25,7 @@ Signed-off-by: Brian Norris --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -660,6 +660,8 @@ static int __mtd_del_partition(struct mt +@@ -671,6 +671,8 @@ static int __mtd_del_partition(struct mt { int err; @@ -34,7 +34,7 @@ Signed-off-by: Brian Norris err = del_mtd_device(&priv->mtd); if (err) return err; -@@ -700,8 +702,6 @@ int mtd_del_partition(struct mtd_info *m +@@ -711,8 +713,6 @@ int mtd_del_partition(struct mtd_info *m list_for_each_entry_safe(slave, next, &mtd_partitions, list) if ((slave->master == master) && (slave->mtd.index == partno)) { diff --git a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch index 7951227654..490eaa2e7c 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0005-mtd-partitions-rename-master-to-the-parent-where-app.patch @@ -578,7 +578,7 @@ Signed-off-by: Brian Norris if (IS_ERR(new)) return PTR_ERR(new); -@@ -683,7 +689,7 @@ int del_mtd_partitions(struct mtd_info * +@@ -694,7 +700,7 @@ int del_mtd_partitions(struct mtd_info * mutex_lock(&mtd_partitions_mutex); list_for_each_entry_safe(slave, next, &mtd_partitions, list) @@ -587,7 +587,7 @@ Signed-off-by: Brian Norris ret = __mtd_del_partition(slave); if (ret < 0) err = ret; -@@ -700,7 +706,7 @@ int mtd_del_partition(struct mtd_info *m +@@ -711,7 +717,7 @@ int mtd_del_partition(struct mtd_info *m mutex_lock(&mtd_partitions_mutex); list_for_each_entry_safe(slave, next, &mtd_partitions, list) @@ -596,7 +596,7 @@ Signed-off-by: Brian Norris (slave->mtd.index == partno)) { ret = __mtd_del_partition(slave); break; -@@ -933,6 +939,6 @@ uint64_t mtd_get_device_size(const struc +@@ -958,6 +964,6 @@ uint64_t mtd_get_device_size(const struc if (!mtd_is_partition(mtd)) return mtd->size; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch index 0d3e10ac20..578e59a8a1 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0006-mtd-partitions-add-support-for-subpartitions.patch @@ -31,7 +31,7 @@ Signed-off-by: Brian Norris &parent->dev : parent->dev.parent; slave->mtd.dev.of_node = part->of_node; -@@ -664,8 +664,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); +@@ -675,8 +675,17 @@ EXPORT_SYMBOL_GPL(mtd_add_partition); */ static int __mtd_del_partition(struct mtd_part *priv) { @@ -49,7 +49,7 @@ Signed-off-by: Brian Norris sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs); err = del_mtd_device(&priv->mtd); -@@ -680,16 +689,16 @@ static int __mtd_del_partition(struct mt +@@ -691,16 +700,16 @@ static int __mtd_del_partition(struct mt /* * This function unregisters and destroy all slave MTD objects which are @@ -69,7 +69,7 @@ Signed-off-by: Brian Norris ret = __mtd_del_partition(slave); if (ret < 0) err = ret; -@@ -699,14 +708,14 @@ int del_mtd_partitions(struct mtd_info * +@@ -710,14 +719,14 @@ int del_mtd_partitions(struct mtd_info * return err; } @@ -86,7 +86,7 @@ Signed-off-by: Brian Norris (slave->mtd.index == partno)) { ret = __mtd_del_partition(slave); break; -@@ -939,6 +948,6 @@ uint64_t mtd_get_device_size(const struc +@@ -964,6 +973,6 @@ uint64_t mtd_get_device_size(const struc if (!mtd_is_partition(mtd)) return mtd->size; diff --git a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch index a28ee316fa..c4c517f238 100644 --- a/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch +++ b/target/linux/generic/backport-4.9/065-v4.13-0007-mtd-partitions-add-support-for-partition-parsers.patch @@ -76,9 +76,9 @@ Signed-off-by: Brian Norris static struct mtd_part *allocate_partition(struct mtd_info *parent, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -758,6 +787,8 @@ int add_mtd_partitions(struct mtd_info * +@@ -778,6 +807,8 @@ int add_mtd_partitions(struct mtd_info * + } - add_mtd_device(&slave->mtd); mtd_add_partition_attrs(slave); + if (parts[i].types) + mtd_parse_part(slave, parts[i].types); diff --git a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch index 60eace2a34..cb464996b7 100644 --- a/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch @@ -55,7 +55,7 @@ Signed-off-by: Boris Brezillon #include "mtdcore.h" -@@ -886,6 +887,92 @@ static int mtd_part_do_parse(struct mtd_ +@@ -911,6 +912,92 @@ static int mtd_part_do_parse(struct mtd_ } /** @@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon * parse_mtd_partitions - parse MTD partitions * @master: the master partition (describes whole MTD device) * @types: names of partition parsers to try or %NULL -@@ -917,19 +1004,30 @@ int parse_mtd_partitions(struct mtd_info +@@ -942,19 +1029,30 @@ int parse_mtd_partitions(struct mtd_info types = default_mtd_part_types; for ( ; *types; types++) { diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch index 59f53df101..b22ddfabd8 100644 --- a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch +++ b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch @@ -22,7 +22,7 @@ Signed-off-by: Boris Brezillon --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -932,7 +932,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -957,7 +957,7 @@ static int mtd_part_of_parse(struct mtd_ struct device_node *np; struct property *prop; const char *compat; @@ -31,7 +31,7 @@ Signed-off-by: Boris Brezillon int ret, err = 0; np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); -@@ -952,7 +952,7 @@ static int mtd_part_of_parse(struct mtd_ +@@ -977,7 +977,7 @@ static int mtd_part_of_parse(struct mtd_ of_node_put(np); /* diff --git a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch index 29aa3b9e8d..4bedd54a03 100644 --- a/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch +++ b/target/linux/generic/backport-4.9/068-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch @@ -98,7 +98,7 @@ Signed-off-by: Boris Brezillon } static struct mtd_part *allocate_partition(struct mtd_info *parent, -@@ -973,30 +960,27 @@ static int mtd_part_of_parse(struct mtd_ +@@ -998,30 +985,27 @@ static int mtd_part_of_parse(struct mtd_ } /** @@ -136,7 +136,7 @@ Signed-off-by: Boris Brezillon struct mtd_part_parser *parser; int ret, err = 0; -@@ -1010,7 +994,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1035,7 +1019,7 @@ int parse_mtd_partitions(struct mtd_info * handled in a separated function. */ if (!strcmp(*types, "ofpart")) { @@ -145,7 +145,7 @@ Signed-off-by: Boris Brezillon } else { pr_debug("%s: parsing partitions %s\n", master->name, *types); -@@ -1021,13 +1005,17 @@ int parse_mtd_partitions(struct mtd_info +@@ -1046,13 +1030,17 @@ int parse_mtd_partitions(struct mtd_info parser ? parser->name : NULL); if (!parser) continue; diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index 6052bf5777..d8d8ad5ea4 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c -@@ -1079,7 +1079,7 @@ static int c_can_poll(struct napi_struct +@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct end: if (work_done < quota) { @@ -313,7 +313,7 @@ Signed-off-by: David S. Miller } --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -1532,7 +1532,7 @@ static int atl1e_clean(struct napi_struc +@@ -1534,7 +1534,7 @@ static int atl1e_clean(struct napi_struc /* If no Tx and not enough Rx work done, exit the polling mode */ if (work_done < budget) { quit_polling: diff --git a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch index 4186f5599f..758de9fdf3 100644 --- a/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch +++ b/target/linux/generic/backport-4.9/402-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch @@ -55,9 +55,9 @@ Signed-off-by: Boris Brezillon static struct mtd_part *allocate_partition(struct mtd_info *parent, const struct mtd_partition *part, int partno, uint64_t cur_offset) -@@ -775,8 +759,8 @@ int add_mtd_partitions(struct mtd_info * +@@ -795,8 +779,8 @@ int add_mtd_partitions(struct mtd_info * + } - add_mtd_device(&slave->mtd); mtd_add_partition_attrs(slave); - if (parts[i].types) - mtd_parse_part(slave, parts[i].types); @@ -66,7 +66,7 @@ Signed-off-by: Boris Brezillon cur_offset = slave->offset + slave->mtd.size; } -@@ -852,6 +836,12 @@ static const char * const default_mtd_pa +@@ -877,6 +861,12 @@ static const char * const default_mtd_pa NULL }; @@ -79,7 +79,7 @@ Signed-off-by: Boris Brezillon static int mtd_part_do_parse(struct mtd_part_parser *parser, struct mtd_info *master, struct mtd_partitions *pparts, -@@ -922,7 +912,9 @@ static int mtd_part_of_parse(struct mtd_ +@@ -947,7 +937,9 @@ static int mtd_part_of_parse(struct mtd_ const char *fixed = "fixed-partitions"; int ret, err = 0; @@ -90,7 +90,7 @@ Signed-off-by: Boris Brezillon of_property_for_each_string(np, "compatible", prop, compat) { parser = mtd_part_get_compatible_parser(compat); if (!parser) -@@ -985,7 +977,8 @@ int parse_mtd_partitions(struct mtd_info +@@ -1010,7 +1002,8 @@ int parse_mtd_partitions(struct mtd_info int ret, err = 0; if (!types) diff --git a/target/linux/generic/hack-4.14/930-crashlog.patch b/target/linux/generic/hack-4.14/930-crashlog.patch index 1479a4c06d..9d09dbd760 100644 --- a/target/linux/generic/hack-4.14/930-crashlog.patch +++ b/target/linux/generic/hack-4.14/930-crashlog.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau depends on BROKEN || !FRV --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -113,6 +113,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex +@@ -110,6 +110,7 @@ obj-$(CONFIG_CONTEXT_TRACKING) += contex obj-$(CONFIG_TORTURE_TEST) += torture.o obj-$(CONFIG_HAS_IOMEM) += memremap.o diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index ec976c165b..4bd4d22168 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -327,7 +327,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3485,6 +3485,8 @@ static __net_initdata struct pernet_oper +@@ -3486,6 +3486,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/hack-4.19/930-crashlog.patch b/target/linux/generic/hack-4.19/930-crashlog.patch index 1562df44a4..bb16f22915 100644 --- a/target/linux/generic/hack-4.19/930-crashlog.patch +++ b/target/linux/generic/hack-4.19/930-crashlog.patch @@ -54,7 +54,7 @@ Signed-off-by: Felix Fietkau help --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -117,6 +117,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o +@@ -114,6 +114,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o obj-$(CONFIG_HAS_IOMEM) += iomem.o obj-$(CONFIG_ZONE_DEVICE) += memremap.o obj-$(CONFIG_RSEQ) += rseq.o 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 5e70756c4e..bf0c289227 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 @@ -110,7 +110,7 @@ Signed-off-by: Hauke Mehrtens #include #include -@@ -844,6 +845,37 @@ void deregister_mtd_parser(struct mtd_pa +@@ -869,6 +870,37 @@ void deregister_mtd_parser(struct mtd_pa } EXPORT_SYMBOL_GPL(deregister_mtd_parser); @@ -148,7 +148,7 @@ Signed-off-by: Hauke Mehrtens /* * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you * are changing this array! -@@ -993,6 +1025,13 @@ int parse_mtd_partitions(struct mtd_info +@@ -1018,6 +1050,13 @@ int parse_mtd_partitions(struct mtd_info struct mtd_partitions pparts = { }; struct mtd_part_parser *parser; int ret, err = 0; @@ -162,7 +162,7 @@ Signed-off-by: Hauke Mehrtens if (!types) types = mtd_is_partition(master) ? default_subpartition_types : -@@ -1034,6 +1073,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1059,6 +1098,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } diff --git a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch index 5f8899ea61..10ad99585d 100644 --- a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch +++ b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch @@ -60,15 +60,15 @@ Signed-off-by: Felix Fietkau /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve * the pointer to that structure. -@@ -668,6 +672,7 @@ int mtd_add_partition(struct mtd_info *p - mutex_unlock(&mtd_partitions_mutex); +@@ -671,6 +675,7 @@ int mtd_add_partition(struct mtd_info *p + if (ret) + goto err_remove_part; - add_mtd_device(&new->mtd); + mtd_partition_split(parent, new); - mtd_add_partition_attrs(new); -@@ -746,6 +751,29 @@ int mtd_del_partition(struct mtd_info *m + return 0; +@@ -757,6 +762,29 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -98,10 +98,10 @@ Signed-off-by: Felix Fietkau /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -777,6 +805,7 @@ int add_mtd_partitions(struct mtd_info * - mutex_unlock(&mtd_partitions_mutex); +@@ -797,6 +825,7 @@ int add_mtd_partitions(struct mtd_info * + goto err_del_partitions; + } - add_mtd_device(&slave->mtd); + mtd_partition_split(master, slave); mtd_add_partition_attrs(slave); /* Look for subpartitions */ diff --git a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch index 359c4c167b..057d473684 100644 --- a/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch +++ b/target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve -@@ -751,6 +755,36 @@ int mtd_del_partition(struct mtd_info *m +@@ -762,6 +766,36 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -1122,6 +1156,61 @@ void mtd_part_parser_cleanup(struct mtd_ +@@ -1147,6 +1181,61 @@ void mtd_part_parser_cleanup(struct mtd_ } } diff --git a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index e870663355..2cc06dd463 100644 --- a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -793,6 +793,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -804,6 +804,7 @@ run_parsers_by_type(struct mtd_part *sla static void split_firmware(struct mtd_info *master, struct mtd_part *part) { @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos } static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) -@@ -802,6 +803,12 @@ static void mtd_partition_split(struct m +@@ -813,6 +814,12 @@ static void mtd_partition_split(struct m if (rootfs_found) return; diff --git a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch index 94c59df01d..7b481ffb47 100644 --- a/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch +++ b/target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -1235,6 +1235,24 @@ int mtd_is_partition(const struct mtd_in +@@ -1260,6 +1260,24 @@ int mtd_is_partition(const struct mtd_in } EXPORT_SYMBOL_GPL(mtd_is_partition); diff --git a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch index adeb9f12f9..2f6a52c23d 100644 --- a/target/linux/generic/pending-4.14/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-4.14/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz help --- a/init/main.c +++ b/init/main.c -@@ -359,6 +359,29 @@ static inline void setup_nr_cpu_ids(void +@@ -358,6 +358,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -540,6 +563,7 @@ asmlinkage __visible void __init start_k +@@ -539,6 +562,7 @@ asmlinkage __visible void __init start_k add_device_randomness(command_line, strlen(command_line)); boot_init_stack_canary(); mm_init_cpumask(&init_mm); diff --git a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 1a416e7782..ec541a865c 100644 --- a/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -6403,7 +6403,7 @@ static void __ref alloc_node_mem_map(str +@@ -6400,7 +6400,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) if (page_to_pfn(mem_map) != pgdat->node_start_pfn) diff --git a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch index e646224df2..bc783deb40 100644 --- a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch +++ b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch @@ -59,15 +59,15 @@ Signed-off-by: Felix Fietkau /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve * the pointer to that structure. -@@ -623,6 +627,7 @@ int mtd_add_partition(struct mtd_info *p - mutex_unlock(&mtd_partitions_mutex); +@@ -626,6 +630,7 @@ int mtd_add_partition(struct mtd_info *p + if (ret) + goto err_remove_part; - add_mtd_device(&new->mtd); + mtd_partition_split(parent, new); - mtd_add_partition_attrs(new); -@@ -701,6 +706,29 @@ int mtd_del_partition(struct mtd_info *m + return 0; +@@ -712,6 +717,29 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -97,10 +97,10 @@ Signed-off-by: Felix Fietkau /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -732,6 +760,7 @@ int add_mtd_partitions(struct mtd_info * - mutex_unlock(&mtd_partitions_mutex); +@@ -752,6 +780,7 @@ int add_mtd_partitions(struct mtd_info * + goto err_del_partitions; + } - add_mtd_device(&slave->mtd); + mtd_partition_split(master, slave); mtd_add_partition_attrs(slave); /* Look for subpartitions */ diff --git a/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch index 4026a2050b..a59659cda6 100644 --- a/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch +++ b/target/linux/generic/pending-4.19/401-mtd-add-support-for-different-partition-parser-types.patch @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve -@@ -706,6 +710,36 @@ int mtd_del_partition(struct mtd_info *m +@@ -717,6 +721,36 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -1041,6 +1075,61 @@ void mtd_part_parser_cleanup(struct mtd_ +@@ -1066,6 +1100,61 @@ void mtd_part_parser_cleanup(struct mtd_ } } diff --git a/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch index 8a90ce6a8b..58d2e44574 100644 --- a/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch +++ b/target/linux/generic/pending-4.19/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -748,6 +748,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -759,6 +759,7 @@ run_parsers_by_type(struct mtd_part *sla static void split_firmware(struct mtd_info *master, struct mtd_part *part) { @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos } static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) -@@ -757,6 +758,12 @@ static void mtd_partition_split(struct m +@@ -768,6 +769,12 @@ static void mtd_partition_split(struct m if (rootfs_found) return; diff --git a/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch index 2e95e99f6d..e404ec1fb2 100644 --- a/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch +++ b/target/linux/generic/pending-4.19/404-mtd-add-more-helper-functions.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -1154,6 +1154,24 @@ int mtd_is_partition(const struct mtd_in +@@ -1179,6 +1179,24 @@ int mtd_is_partition(const struct mtd_in } EXPORT_SYMBOL_GPL(mtd_is_partition); diff --git a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch index 51af6b5d6b..0750ab77c2 100644 --- a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz help --- a/init/main.c +++ b/init/main.c -@@ -366,6 +366,29 @@ static inline void setup_nr_cpu_ids(void +@@ -365,6 +365,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -558,6 +581,7 @@ asmlinkage __visible void __init start_k +@@ -557,6 +580,7 @@ asmlinkage __visible void __init start_k add_device_randomness(command_line, strlen(command_line)); boot_init_stack_canary(); mm_init_cpumask(&init_mm); diff --git a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch index 64ed23170b..11a33b7ebf 100644 --- a/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch +++ b/target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch @@ -114,7 +114,7 @@ Signed-off-by: Hauke Mehrtens #include #include -@@ -827,6 +828,42 @@ void deregister_mtd_parser(struct mtd_pa +@@ -852,6 +853,42 @@ void deregister_mtd_parser(struct mtd_pa EXPORT_SYMBOL_GPL(deregister_mtd_parser); /* @@ -157,7 +157,7 @@ Signed-off-by: Hauke Mehrtens * Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you * are changing this array! */ -@@ -975,6 +1012,13 @@ int parse_mtd_partitions(struct mtd_info +@@ -1000,6 +1037,13 @@ int parse_mtd_partitions(struct mtd_info struct mtd_partitions pparts = { }; struct mtd_part_parser *parser; int ret, err = 0; @@ -171,7 +171,7 @@ Signed-off-by: Hauke Mehrtens if (!types) types = mtd_is_partition(master) ? default_subpartition_types : -@@ -1016,6 +1060,7 @@ int parse_mtd_partitions(struct mtd_info +@@ -1041,6 +1085,7 @@ int parse_mtd_partitions(struct mtd_info if (ret < 0 && !err) err = ret; } diff --git a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch index c9e3ca3713..4369ed3f4f 100644 --- a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch +++ b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch @@ -60,15 +60,15 @@ Signed-off-by: Felix Fietkau /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve * the pointer to that structure. -@@ -650,6 +654,7 @@ int mtd_add_partition(struct mtd_info *p - mutex_unlock(&mtd_partitions_mutex); +@@ -653,6 +657,7 @@ int mtd_add_partition(struct mtd_info *p + if (ret) + goto err_remove_part; - add_mtd_device(&new->mtd); + mtd_partition_split(parent, new); - mtd_add_partition_attrs(new); -@@ -728,6 +733,29 @@ int mtd_del_partition(struct mtd_info *m + return 0; +@@ -739,6 +744,29 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -98,10 +98,10 @@ Signed-off-by: Felix Fietkau /* * This function, given a master MTD object and a partition table, creates * and registers slave MTD objects which are bound to the master according to -@@ -759,6 +787,7 @@ int add_mtd_partitions(struct mtd_info * - mutex_unlock(&mtd_partitions_mutex); +@@ -779,6 +807,7 @@ int add_mtd_partitions(struct mtd_info * + goto err_del_partitions; + } - add_mtd_device(&slave->mtd); + mtd_partition_split(master, slave); mtd_add_partition_attrs(slave); /* Look for subpartitions */ diff --git a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch index 5a9d3f7560..eefba9f508 100644 --- a/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch +++ b/target/linux/generic/pending-4.9/401-mtd-add-support-for-different-partition-parser-types.patch @@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos /* * Given a pointer to the MTD object in the mtd_part structure, we can retrieve -@@ -733,6 +737,36 @@ int mtd_del_partition(struct mtd_info *m +@@ -744,6 +748,36 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -57,7 +57,7 @@ Signed-off-by: Gabor Juhos #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -1109,6 +1143,61 @@ void mtd_part_parser_cleanup(struct mtd_ +@@ -1134,6 +1168,61 @@ void mtd_part_parser_cleanup(struct mtd_ } } 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 42d95360fd..6085cb8ffb 100644 --- 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 @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -775,6 +775,7 @@ run_parsers_by_type(struct mtd_part *sla +@@ -786,6 +786,7 @@ run_parsers_by_type(struct mtd_part *sla static void split_firmware(struct mtd_info *master, struct mtd_part *part) { @@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos } static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) -@@ -784,6 +785,12 @@ static void mtd_partition_split(struct m +@@ -795,6 +796,12 @@ static void mtd_partition_split(struct m if (rootfs_found) return; diff --git a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch index b59977455e..294a0f6f8b 100644 --- a/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch +++ b/target/linux/generic/pending-4.9/404-mtd-add-more-helper-functions.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -1222,6 +1222,24 @@ int mtd_is_partition(const struct mtd_in +@@ -1247,6 +1247,24 @@ int mtd_is_partition(const struct mtd_in } EXPORT_SYMBOL_GPL(mtd_is_partition); diff --git a/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index b6f1f47424..5d3243ccb4 100644 --- a/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k +@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch b/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch deleted file mode 100644 index dde7b3f23b..0000000000 --- a/target/linux/lantiq/patches-4.19/0003-usb-dwc2-use-a-longer-core-rest-timeout-in-dwc2_core.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 09bbf8c732e7a6ce290fc7c2d5a3e79ec6c3e8d2 Mon Sep 17 00:00:00 2001 -From: Mathias Kresin -Date: Wed, 3 Jul 2019 17:03:02 +0200 -Subject: [PATCH] usb: dwc2: use a longer core rest timeout in - dwc2_core_reset() - -Testing on different generations of Lantiq MIPS SoC based boards, showed -that it takes up to 1500 us until the core reset bit is cleared. - -The driver from the vendor SDK (ifxhcd) uses a 1 second timeout. Use the -same timeout to fix wrong hang detections and make the driver work for -Lantiq MIPS SoCs. - -Signed-off-by: Mathias Kresin ---- - drivers/usb/dwc2/core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/dwc2/core.c -+++ b/drivers/usb/dwc2/core.c -@@ -524,7 +524,7 @@ int dwc2_core_reset(struct dwc2_hsotg *h - greset |= GRSTCTL_CSFTRST; - dwc2_writel(hsotg, greset, GRSTCTL); - -- if (dwc2_hsotg_wait_bit_clear(hsotg, GRSTCTL, GRSTCTL_CSFTRST, 50)) { -+ if (dwc2_hsotg_wait_bit_clear(hsotg, GRSTCTL, GRSTCTL_CSFTRST, 10000)) { - dev_warn(hsotg->dev, "%s: HANG! Soft Reset timeout GRSTCTL GRSTCTL_CSFTRST\n", - __func__); - return -EBUSY; diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 49e528402c..7be95d49e4 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -321,7 +321,7 @@ Signed-off-by: Yangbo Lu } else if (has_acpi_companion(dma_dev)) { --- a/drivers/gpu/ipu-v3/ipu-pre.c +++ b/drivers/gpu/ipu-v3/ipu-pre.c -@@ -124,7 +124,8 @@ ipu_pre_lookup_by_phandle(struct device +@@ -125,7 +125,8 @@ ipu_pre_lookup_by_phandle(struct device list_for_each_entry(pre, &ipu_pre_list, list) { if (pre_node == pre->dev->of_node) { mutex_unlock(&ipu_pre_list_mutex); diff --git a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch index d15794f2e3..8f11632d04 100644 --- a/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -180,7 +180,7 @@ Signed-off-by: Michael Gray static int kernel_init(void *); extern void init_IRQ(void); -@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k +@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch index 6172e6fe45..0cb9e99602 100644 --- a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -180,7 +180,7 @@ Signed-off-by: Michael Gray static int kernel_init(void *); extern void init_IRQ(void); -@@ -592,6 +596,18 @@ asmlinkage __visible void __init start_k +@@ -591,6 +595,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 3758ca0dc3..d3b047f3c4 100644 --- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella static int kernel_init(void *); extern void init_IRQ(void); -@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k +@@ -573,6 +577,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch index ff4c5b17fa..0b305a8105 100644 --- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -2735,6 +2735,18 @@ static const struct usb_device_id uvc_id +@@ -2737,6 +2737,18 @@ static const struct usb_device_id uvc_id .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_FORCE_Y8 }, diff --git a/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch b/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch index 865ae79f43..cd1462fbcf 100644 --- a/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch +++ b/target/linux/ramips/patches-4.14/0200-linkit_bootstrap.patch @@ -1,6 +1,6 @@ --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile -@@ -57,6 +57,7 @@ obj-$(CONFIG_CXL_BASE) += cxl/ +@@ -56,6 +56,7 @@ obj-$(CONFIG_CXL_BASE) += cxl/ obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o