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:
@@ -10,7 +10,7 @@ Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
|
||||
|
||||
--- 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.
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
|
||||
|
||||
--- 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"
|
||||
|
||||
@@ -648,7 +648,7 @@ Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
|
||||
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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -58,4 +58,4 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
|
||||
+ depends on QUICC_ENGINE && FSL_SOC && PPC32
|
||||
select FSL_PQ_MDIO
|
||||
select PHYLIB
|
||||
---help---
|
||||
select FIXED_PHY
|
||||
|
||||
Reference in New Issue
Block a user