kernel: bump 5.4 to 5.4.45
Fixes CVE-2020-10757 via upstream commit df4988aa1c96 ("mm: Fix mremap
not considering huge pmd devmap").
Resolved merge conflict in the following patches:
bcm27xx: 950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
Refreshed patches, removed upstreamed patch:
generic: 751-v5.8-net-dsa-mt7530-set-CPU-port-to-fallback-mode.patch
generic: 754-v5.7-net-dsa-mt7530-fix-roaming-from-DSA-user-ports.patch
Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
This commit is contained in:
@@ -13,8 +13,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 +++++
|
||||
3 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
||||
index 1a9a9d9..60563ff 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
||||
@@ -313,6 +313,11 @@
|
||||
@@ -29,8 +27,6 @@ index 1a9a9d9..60563ff 100644
|
||||
};
|
||||
|
||||
&ldb {
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
||||
index 54b2bea..8942bec 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
||||
@@ -304,6 +304,11 @@
|
||||
@@ -45,8 +41,6 @@ index 54b2bea..8942bec 100644
|
||||
};
|
||||
|
||||
&ldb {
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
||||
index 1b6c133..c40583d 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
||||
@@ -361,6 +361,11 @@
|
||||
@@ -61,6 +55,3 @@ index 1b6c133..c40583d 100644
|
||||
};
|
||||
|
||||
&ldb {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 25 +++++++++++++++++++++++++
|
||||
1 file changed, 25 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
index be1af74..30fe47f 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
@@ -220,6 +220,14 @@
|
||||
@@ -54,6 +52,3 @@ index be1af74..30fe47f 100644
|
||||
pinctrl_uart4: uart4grp {
|
||||
fsl,pins = <
|
||||
MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA 0x1b0b1
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
|
||||
index dc646b7..bb35971 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
|
||||
@@ -258,6 +258,14 @@
|
||||
@@ -45,6 +43,3 @@ index dc646b7..bb35971 100644
|
||||
pinctrl_wdog: wdoggrp {
|
||||
fsl,pins = <
|
||||
MX6QDL_PAD_DISP0_DAT8__WDOG1_B 0x1b0b0
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 31 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
|
||||
index e8e36df..69ca70d 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
|
||||
@@ -295,6 +295,15 @@
|
||||
@@ -76,6 +74,3 @@ index e8e36df..69ca70d 100644
|
||||
pinctrl_pcie: pciegrp {
|
||||
fsl,pins = <
|
||||
MX6QDL_PAD_DISP0_DAT10__GPIO4_IO31 0x1b0b0 /* PCI_RST# */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -13,8 +13,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 31 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
|
||||
index 6d21cc6..76d6cf5 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
|
||||
@@ -248,6 +248,15 @@
|
||||
@@ -69,6 +67,3 @@ index 6d21cc6..76d6cf5 100644
|
||||
pinctrl_pcie: pciegrp {
|
||||
fsl,pins = <
|
||||
MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /* PCIE RST */
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -16,8 +16,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 32 ++++++++++++--------------------
|
||||
1 file changed, 12 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
index 30fe47f..b850f8f 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
@@ -83,19 +83,6 @@
|
||||
@@ -82,6 +80,3 @@ index 30fe47f..b850f8f 100644
|
||||
pinctrl_reg_wl: regwlgrp {
|
||||
fsl,pins = <
|
||||
MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x1b0b1
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -12,8 +12,6 @@ Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
||||
arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
index b850f8f..0857de5 100644
|
||||
--- a/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
+++ b/arch/arm/boot/dts/imx6qdl-gw5910.dtsi
|
||||
@@ -81,7 +81,6 @@
|
||||
@@ -33,6 +31,3 @@ index b850f8f..0857de5 100644
|
||||
non-removable;
|
||||
bus-width = <4>;
|
||||
status = "okay";
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user