From e5aa498acb847320a382034ba0b9cfc55e6f13ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 9 Jun 2020 14:18:25 +0200 Subject: kernel: bump 5.4 to 5.4.45 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch | 2 +- .../patches-5.4/701-net-0123-config-enable-SDK-DPAA-driver.patch | 2 +- ...701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch | 2 +- ...1-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch | 4 ++-- .../patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch b/target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch index 47d801160a..49cece6fb7 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch @@ -10,7 +10,7 @@ Signed-off-by: Madalin Bucur --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig -@@ -95,6 +95,7 @@ config GIANFAR +@@ -97,6 +97,7 @@ config GIANFAR This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx, and MPC86xx family of chips, the eTSEC on LS1021A and the FEC on the 8540. diff --git a/target/linux/layerscape/patches-5.4/701-net-0123-config-enable-SDK-DPAA-driver.patch b/target/linux/layerscape/patches-5.4/701-net-0123-config-enable-SDK-DPAA-driver.patch index e025c145ed..05b1aee807 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0123-config-enable-SDK-DPAA-driver.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0123-config-enable-SDK-DPAA-driver.patch @@ -10,7 +10,7 @@ Signed-off-by: Madalin Bucur --- a/drivers/net/ethernet/freescale/Kconfig +++ b/drivers/net/ethernet/freescale/Kconfig -@@ -96,7 +96,7 @@ config GIANFAR +@@ -98,7 +98,7 @@ config GIANFAR and MPC86xx family of chips, the eTSEC on LS1021A and the FEC on the 8540. source "drivers/net/ethernet/freescale/sdk_fman/Kconfig" diff --git a/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch b/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch index aae0e670f2..6166a49ce6 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0273-net-dsa-ocelot-add-tsn-support-for-felix-switch.patch @@ -648,7 +648,7 @@ Signed-off-by: Xiaoliang Yang static const u32 vsc9959_gcb_regmap[] = { --- a/include/net/dsa.h +++ b/include/net/dsa.h -@@ -545,6 +545,7 @@ struct dsa_switch_ops { +@@ -552,6 +552,7 @@ struct dsa_switch_ops { */ netdev_tx_t (*port_deferred_xmit)(struct dsa_switch *ds, int port, struct sk_buff *skb); diff --git a/target/linux/layerscape/patches-5.4/701-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch b/target/linux/layerscape/patches-5.4/701-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch index 40d22f4652..d3fdfb3fb1 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0381-net-dsa-Pass-pcs_poll-flag-from-driver-to-PHYLINK.patch @@ -24,7 +24,7 @@ on touch") which was merged in v5.4-rc3. --- a/include/net/dsa.h +++ b/include/net/dsa.h -@@ -277,6 +277,11 @@ struct dsa_switch { +@@ -284,6 +284,11 @@ struct dsa_switch { */ bool vlan_filtering; @@ -38,7 +38,7 @@ on touch") which was merged in v5.4-rc3. struct dsa_port ports[]; --- a/net/dsa/port.c +++ b/net/dsa/port.c -@@ -625,6 +625,7 @@ static int dsa_port_phylink_register(str +@@ -639,6 +639,7 @@ static int dsa_port_phylink_register(str dp->pl_config.dev = ds->dev; dp->pl_config.type = PHYLINK_DEV; diff --git a/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch b/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch index 7aaf8c7162..bace6fd8f0 100644 --- a/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch +++ b/target/linux/layerscape/patches-5.4/814-qe-0006-config-qe-add-irq-qeic-support.patch @@ -58,4 +58,4 @@ Signed-off-by: Zhao Qiang + depends on QUICC_ENGINE && FSL_SOC && PPC32 select FSL_PQ_MDIO select PHYLIB - ---help--- + select FIXED_PHY -- cgit v1.2.3