e5aa498acb
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>
21 lines
780 B
Diff
21 lines
780 B
Diff
From d6b59a9bf9d88cbfe41b96603824ffffea305b0f Mon Sep 17 00:00:00 2001
|
|
From: Madalin Bucur <madalin.bucur@nxp.com>
|
|
Date: Fri, 19 May 2017 09:08:36 +0300
|
|
Subject: [PATCH] config: enable SDK FMan driver
|
|
|
|
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/Kconfig | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/ethernet/freescale/Kconfig
|
|
+++ b/drivers/net/ethernet/freescale/Kconfig
|
|
@@ -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.
|
|
+source "drivers/net/ethernet/freescale/sdk_fman/Kconfig"
|
|
|
|
source "drivers/net/ethernet/freescale/dpaa/Kconfig"
|
|
source "drivers/net/ethernet/freescale/dpaa2/Kconfig"
|