diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-05 12:21:47 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-06 11:56:18 +0200 |
commit | 958411aa611582d9482ae6d319e1a986f195a596 (patch) | |
tree | a9d01e8707ce38022ec5e6c349bc1b8fd75f643b /target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch | |
parent | 2807f84b629c1a05304e4b39447973084889d9de (diff) | |
download | upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.gz upstream-958411aa611582d9482ae6d319e1a986f195a596.tar.bz2 upstream-958411aa611582d9482ae6d319e1a986f195a596.zip |
kernel: bump 4.14 to 4.14.136
Refreshed all patches.
Altered patches:
- 306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch
Remove upstreamed:
- 505-arm64-dts-marvell-Fix-A37xx-UART0-register-size
Fixes:
- CVE-2019-13648
- CVE-2019-10207
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch b/target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch deleted file mode 100644 index 9e2b1c14eb..0000000000 --- a/target/linux/mvebu/patches-4.14/505-arm64-dts-marvell-Fix-A37xx-UART0-register-size.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c737abc193d16e62e23e2fb585b8b7398ab380d8 Mon Sep 17 00:00:00 2001 -From: allen yan <yanwei@marvell.com> -Date: Thu, 7 Sep 2017 15:04:53 +0200 -Subject: arm64: dts: marvell: Fix A37xx UART0 register size - -Armada-37xx UART0 registers are 0x200 bytes wide. Right next to them are -the UART1 registers that should not be declared in this node. - -Update the example in DT bindings document accordingly. - -Signed-off-by: allen yan <yanwei@marvell.com> -Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com> -Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> ---- - Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 +- - arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/Documentation/devicetree/bindings/serial/mvebu-uart.txt -+++ b/Documentation/devicetree/bindings/serial/mvebu-uart.txt -@@ -8,6 +8,6 @@ Required properties: - Example: - serial@12000 { - compatible = "marvell,armada-3700-uart"; -- reg = <0x12000 0x400>; -+ reg = <0x12000 0x200>; - interrupts = <43>; - }; ---- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi -+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi -@@ -134,7 +134,7 @@ - - uart0: serial@12000 { - compatible = "marvell,armada-3700-uart"; -- reg = <0x12000 0x400>; -+ reg = <0x12000 0x200>; - interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; |