aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-06-09 14:18:25 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-09 16:59:33 +0200
commite5aa498acb847320a382034ba0b9cfc55e6f13ca (patch)
treefac56950bd2af2c34cd8705b55040ebd0f5042a9 /target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch
parentdf6a33a8d4115fcb7edd048f7dbfea054e9477b4 (diff)
downloadupstream-e5aa498acb847320a382034ba0b9cfc55e6f13ca.tar.gz
upstream-e5aa498acb847320a382034ba0b9cfc55e6f13ca.tar.bz2
upstream-e5aa498acb847320a382034ba0b9cfc55e6f13ca.zip
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>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0122-config-enable-SDK-FMan-driver.patch2
1 files changed, 1 insertions, 1 deletions
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 <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.