From 88ba41453dbc65e1d5d596073d66bdf2e59a43a1 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Sat, 17 Feb 2018 22:59:07 +0100 Subject: kernel: bump 4.14 to 4.14.20 Refresh patches. Remove upstreamed patches: - backport/080-v4.15-0001-arch-define-weak-abort.patch - backport/081-v4.15-0002-kernel-exit.c-export-abort-to-modules.patch Update patch that no longer applies: pending/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch Fixes CVE-2017-8824. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel --- target/linux/mediatek/patches-4.14/0064-dts.patch | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'target/linux/mediatek/patches-4.14/0064-dts.patch') diff --git a/target/linux/mediatek/patches-4.14/0064-dts.patch b/target/linux/mediatek/patches-4.14/0064-dts.patch index 9120dfc2cd..9f069e7809 100644 --- a/target/linux/mediatek/patches-4.14/0064-dts.patch +++ b/target/linux/mediatek/patches-4.14/0064-dts.patch @@ -1,7 +1,5 @@ -Index: linux-4.14.18/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts -=================================================================== ---- linux-4.14.18.orig/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts -+++ linux-4.14.18/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts ++++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts @@ -21,6 +21,10 @@ stdout-path = "serial2:115200n8"; }; @@ -117,10 +115,8 @@ Index: linux-4.14.18/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts &i2c0 { pinctrl-names = "default"; -Index: linux-4.14.18/arch/arm/boot/dts/Makefile -=================================================================== ---- linux-4.14.18.orig/arch/arm/boot/dts/Makefile -+++ linux-4.14.18/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile @@ -1061,6 +1061,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ mt6580-evbp1.dtb \ mt6589-aquaris5.dtb \ @@ -129,10 +125,8 @@ Index: linux-4.14.18/arch/arm/boot/dts/Makefile mt7623n-rfb-nand.dtb \ mt7623n-bananapi-bpi-r2.dtb \ mt8127-moose.dtb \ -Index: linux-4.14.18/arch/arm/boot/dts/mt7623a-rfb-emmc.dts -=================================================================== --- /dev/null -+++ linux-4.14.18/arch/arm/boot/dts/mt7623a-rfb-emmc.dts ++++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts @@ -0,0 +1,449 @@ +/* + * Copyright 2017 Sean Wang @@ -583,10 +577,8 @@ Index: linux-4.14.18/arch/arm/boot/dts/mt7623a-rfb-emmc.dts + status = "okay"; +}; + -Index: linux-4.14.18/arch/arm/boot/dts/mt7623.dtsi -=================================================================== ---- linux-4.14.18.orig/arch/arm/boot/dts/mt7623.dtsi -+++ linux-4.14.18/arch/arm/boot/dts/mt7623.dtsi +--- a/arch/arm/boot/dts/mt7623.dtsi ++++ b/arch/arm/boot/dts/mt7623.dtsi @@ -753,6 +753,7 @@ "syscon"; reg = <0 0x1b000000 0 0x1000>; -- cgit v1.2.3