diff options
author | Stijn Segers <foss@volatilesystems.org> | 2018-03-04 17:12:45 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-04 20:36:43 +0100 |
commit | 2ae9ebf374023dec22dc5c0a97e170db6287587c (patch) | |
tree | 4c8ec3161c56cb730f779e835a1cbc215a29446f /target/linux/mediatek | |
parent | 571d3def6baf2047f5417182f810a689085ccbd7 (diff) | |
download | upstream-2ae9ebf374023dec22dc5c0a97e170db6287587c.tar.gz upstream-2ae9ebf374023dec22dc5c0a97e170db6287587c.tar.bz2 upstream-2ae9ebf374023dec22dc5c0a97e170db6287587c.zip |
kernel: bump 4.4 to 4.4.120 for 17.01
Bump the 4.4 kernel for the 17.01 release to 4.4.120. Refresh patches.
Compile-tested: ar71xx, ramips/mt7621, x86/64
Run-tested: ar71xx, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/mediatek')
2 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/mediatek/patches-4.4/0020-arm64-dts-mediatek-add-xHCI-usb-phy-for-mt8173.patch b/target/linux/mediatek/patches-4.4/0020-arm64-dts-mediatek-add-xHCI-usb-phy-for-mt8173.patch index 50c03ee892..5b57b9edbc 100644 --- a/target/linux/mediatek/patches-4.4/0020-arm64-dts-mediatek-add-xHCI-usb-phy-for-mt8173.patch +++ b/target/linux/mediatek/patches-4.4/0020-arm64-dts-mediatek-add-xHCI-usb-phy-for-mt8173.patch @@ -57,7 +57,7 @@ Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> #include <dt-bindings/power/mt8173-power.h> #include <dt-bindings/reset-controller/mt8173-resets.h> #include "mt8173-pinfunc.h" -@@ -510,6 +511,47 @@ +@@ -512,6 +513,47 @@ status = "disabled"; }; diff --git a/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch b/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch index a5b51d4a90..f1f4971b3d 100644 --- a/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch +++ b/target/linux/mediatek/patches-4.4/0072-mtd-backport-v4.7-0day-patches-from-Boris.patch @@ -5142,7 +5142,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> long long offset, long long length); --- a/include/linux/mtd/sh_flctl.h +++ b/include/linux/mtd/sh_flctl.h -@@ -143,11 +143,11 @@ enum flctl_ecc_res_t { +@@ -143,7 +143,6 @@ enum flctl_ecc_res_t { struct dma_chan; struct sh_flctl { @@ -5150,12 +5150,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> struct nand_chip chip; struct platform_device *pdev; struct dev_pm_qos_request pm_qos; - void __iomem *reg; -+ resource_size_t fifo; - - uint8_t done_buff[2048 + 64]; /* max size 2048 + 64 */ - int read_bytes; -@@ -186,7 +186,7 @@ struct sh_flctl_platform_data { +@@ -187,7 +186,7 @@ struct sh_flctl_platform_data { static inline struct sh_flctl *mtd_to_flctl(struct mtd_info *mtdinfo) { |