From 3662157d8beda32d95fdc039da0b8114c0c2bb7b Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 28 Jan 2019 11:03:25 +0100 Subject: kernel: bump 4.14 to 4.14.96 Refreshed all patches. Remove upstreamed patches: - 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch') diff --git a/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch b/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch index 5aadaa7b0b..0503b88823 100644 --- a/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch +++ b/target/linux/sunxi/patches-4.14/040-arm64-dts-allwinner-a64-Add-watchdog.patch @@ -15,8 +15,6 @@ Signed-off-by: Maxime Ripard arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt -index 62dd5baad70e..04fc368d828f 100644 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt @@ -2,8 +2,10 @@ Allwinner SoCs Watchdog timer @@ -32,11 +30,9 @@ index 62dd5baad70e..04fc368d828f 100644 - reg : Specifies base physical address and size of the registers. Example: -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 64e452a758fa..8401e7f887ff 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -665,5 +665,12 @@ +@@ -537,5 +537,12 @@ #address-cells = <1>; #size-cells = <0>; }; @@ -49,6 +45,3 @@ index 64e452a758fa..8401e7f887ff 100644 + }; }; }; --- -2.17.1 - -- cgit v1.2.3