From 0232f57e1af6580542c0ed1ce1d76c7cd4084613 Mon Sep 17 00:00:00 2001
From: Koen Vandeputte <koen.vandeputte@ncentric.com>
Date: Wed, 15 Apr 2020 14:55:36 +0200
Subject: kernel: bump 4.14 to 4.14.176

Refreshed all patches.

Remove upstreamed:
- 0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
- 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch
- 003-ARM-dts-oxnas-Fix-clear-mask-property.patch

Fixes:
- CVE-2020-8647
- CVE-2020-8648 (potentially)
- CVE-2020-8649

Compile-tested on: cns3xxx, octeontx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
---
 ...p-versatile-fpga-Apply-clear-mask-earlier.patch |  6 +--
 ...003-ARM-dts-oxnas-Fix-clear-mask-property.patch | 55 ----------------------
 2 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 target/linux/oxnas/patches-4.14/003-ARM-dts-oxnas-Fix-clear-mask-property.patch

(limited to 'target/linux/oxnas')

diff --git a/target/linux/oxnas/patches-4.14/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch b/target/linux/oxnas/patches-4.14/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch
index eef2c4624f..7a82b5a7cc 100644
--- a/target/linux/oxnas/patches-4.14/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch
+++ b/target/linux/oxnas/patches-4.14/002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch
@@ -32,11 +32,9 @@ Cc: Daniel Golle <daniel@makrotopia.org>
  drivers/irqchip/irq-versatile-fpga.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c
-index 70e2cfff8175..f1386733d3bc 100644
 --- a/drivers/irqchip/irq-versatile-fpga.c
 +++ b/drivers/irqchip/irq-versatile-fpga.c
-@@ -212,6 +212,9 @@ int __init fpga_irq_of_init(struct device_node *node,
+@@ -212,6 +212,9 @@ int __init fpga_irq_of_init(struct devic
  	if (of_property_read_u32(node, "valid-mask", &valid_mask))
  		valid_mask = 0;
  
@@ -46,7 +44,7 @@ index 70e2cfff8175..f1386733d3bc 100644
  	/* Some chips are cascaded from a parent IRQ */
  	parent_irq = irq_of_parse_and_map(node, 0);
  	if (!parent_irq) {
-@@ -221,9 +224,6 @@ int __init fpga_irq_of_init(struct device_node *node,
+@@ -221,9 +224,6 @@ int __init fpga_irq_of_init(struct devic
  
  	fpga_irq_init(base, node->name, 0, parent_irq, valid_mask, node);
  
diff --git a/target/linux/oxnas/patches-4.14/003-ARM-dts-oxnas-Fix-clear-mask-property.patch b/target/linux/oxnas/patches-4.14/003-ARM-dts-oxnas-Fix-clear-mask-property.patch
deleted file mode 100644
index cac125e7b3..0000000000
--- a/target/linux/oxnas/patches-4.14/003-ARM-dts-oxnas-Fix-clear-mask-property.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From patchwork Sat Mar 21 14:36:53 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Sungbo Eo <mans0n@gorani.run>
-X-Patchwork-Id: 11451187
-From: Sungbo Eo <mans0n@gorani.run>
-To: Neil Armstrong <narmstrong@baylibre.com>,
- Rob Herring <robh+dt@kernel.org>,
- Mark Rutland <mark.rutland@arm.com>, linux-arm-kernel@lists.infradead.org,
- linux-oxnas@groups.io, devicetree@vger.kernel.org,
- linux-kernel@vger.kernel.org
-Subject: [PATCH] ARM: dts: oxnas: Fix clear-mask property
-Date: Sat, 21 Mar 2020 23:36:53 +0900
-Message-Id: <20200321143653.2412823-1-mans0n@gorani.run>
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-
-Disable all rps-irq interrupts during driver initialization to prevent
-an accidental interrupt on GIC.
-
-Fixes: 84316f4ef141 ("ARM: boot: dts: Add Oxford Semiconductor OX810SE dtsi")
-Fixes: 38d4a53733f5 ("ARM: dts: Add support for OX820 and Pogoplug V3")
-Signed-off-by: Sungbo Eo <mans0n@gorani.run>
-Acked-by: Neil Armstrong <narmstrong@baylibre.com>
----
- arch/arm/boot/dts/ox810se.dtsi | 4 ++--
- arch/arm/boot/dts/ox820.dtsi   | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/ox810se.dtsi
-+++ b/arch/arm/boot/dts/ox810se.dtsi
-@@ -323,8 +323,8 @@
- 					interrupt-controller;
- 					reg = <0 0x200>;
- 					#interrupt-cells = <1>;
--					valid-mask = <0xFFFFFFFF>;
--					clear-mask = <0>;
-+					valid-mask = <0xffffffff>;
-+					clear-mask = <0xffffffff>;
- 				};
- 
- 				timer0: timer@200 {
---- a/arch/arm/boot/dts/ox820.dtsi
-+++ b/arch/arm/boot/dts/ox820.dtsi
-@@ -240,8 +240,8 @@
- 					reg = <0 0x200>;
- 					interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
- 					#interrupt-cells = <1>;
--					valid-mask = <0xFFFFFFFF>;
--					clear-mask = <0>;
-+					valid-mask = <0xffffffff>;
-+					clear-mask = <0xffffffff>;
- 				};
- 
- 				timer0: timer@200 {
-- 
cgit v1.2.3