mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
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>
99 lines
4.4 KiB
Diff
99 lines
4.4 KiB
Diff
From patchwork Tue Dec 10 08:14:37 2019
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Landen Chao <landen.chao@mediatek.com>
|
|
X-Patchwork-Id: 1206962
|
|
X-Patchwork-Delegate: davem@davemloft.net
|
|
Return-Path: <netdev-owner@vger.kernel.org>
|
|
X-Original-To: patchwork-incoming-netdev@ozlabs.org
|
|
Delivered-To: patchwork-incoming-netdev@ozlabs.org
|
|
Authentication-Results: ozlabs.org; spf=none (no SPF record)
|
|
smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;
|
|
helo=vger.kernel.org;
|
|
envelope-from=netdev-owner@vger.kernel.org;
|
|
receiver=<UNKNOWN>)
|
|
Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none)
|
|
header.from=mediatek.com
|
|
Authentication-Results: ozlabs.org; dkim=pass (1024-bit key;
|
|
unprotected) header.d=mediatek.com header.i=@mediatek.com
|
|
header.b="pTp2PPKi"; dkim-atps=neutral
|
|
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
|
|
by ozlabs.org (Postfix) with ESMTP id 47XCY42hJqz9sRf
|
|
for <patchwork-incoming-netdev@ozlabs.org>;
|
|
Tue, 10 Dec 2019 19:15:20 +1100 (AEDT)
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
|
id S1727061AbfLJIO5 (ORCPT
|
|
<rfc822;patchwork-incoming-netdev@ozlabs.org>);
|
|
Tue, 10 Dec 2019 03:14:57 -0500
|
|
Received: from mailgw02.mediatek.com ([210.61.82.184]:45567 "EHLO
|
|
mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by
|
|
vger.kernel.org with ESMTP id S1726932AbfLJIO4 (ORCPT
|
|
<rfc822;netdev@vger.kernel.org>); Tue, 10 Dec 2019 03:14:56 -0500
|
|
X-UUID: f5656f2ff80846ebb40e3da87d60fb90-20191210
|
|
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
|
|
d=mediatek.com; s=dk;
|
|
h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From;
|
|
bh=THbuVAlbiUyMgTyO0rwrKX/mskzsxNwDv9gxXp2O2c8=;
|
|
b=pTp2PPKiPwR8QPOOf5yohf9lFERpEDlo/g/t2ChREfzFb9c+wylx++/div4hAB337+Ja2KIzbSu4URgdj5XHXUly8yuxrD8OBvV+ox0jlNLiRIN2dkCgL4fyzPr7ZPSk9lObJW05Yx2LY6Jy6eJZZXSShLlqLd0lDKwy6FT+hSI=;
|
|
X-UUID: f5656f2ff80846ebb40e3da87d60fb90-20191210
|
|
Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by
|
|
mailgw02.mediatek.com (envelope-from <landen.chao@mediatek.com>)
|
|
(Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS)
|
|
with ESMTP id 565263134; Tue, 10 Dec 2019 16:14:47 +0800
|
|
Received: from mtkcas08.mediatek.inc (172.21.101.126) by
|
|
mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server
|
|
(TLS) id 15.0.1395.4; Tue, 10 Dec 2019 16:14:38 +0800
|
|
Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas08.mediatek.inc
|
|
(172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via
|
|
Frontend Transport; Tue, 10 Dec 2019 16:14:26 +0800
|
|
From: Landen Chao <landen.chao@mediatek.com>
|
|
To: <andrew@lunn.ch>, <f.fainelli@gmail.com>,
|
|
<vivien.didelot@savoirfairelinux.com>, <matthias.bgg@gmail.com>,
|
|
<robh+dt@kernel.org>, <mark.rutland@arm.com>
|
|
CC: <devicetree@vger.kernel.org>, <netdev@vger.kernel.org>,
|
|
<linux-kernel@vger.kernel.org>,
|
|
<linux-mediatek@lists.infradead.org>, <davem@davemloft.net>,
|
|
<sean.wang@mediatek.com>, <opensource@vdorst.com>,
|
|
<frank-w@public-files.de>, Landen Chao <landen.chao@mediatek.com>
|
|
Subject: [PATCH net-next 1/6] net: dsa: mt7530: Refine message in Kconfig
|
|
Date: Tue, 10 Dec 2019 16:14:37 +0800
|
|
Message-ID: <6ecf6cbf38223f35854bc361c2eefa1d85c724d2.1575914275.git.landen.chao@mediatek.com>
|
|
X-Mailer: git-send-email 2.18.0
|
|
In-Reply-To: <cover.1575914275.git.landen.chao@mediatek.com>
|
|
References: <cover.1575914275.git.landen.chao@mediatek.com>
|
|
MIME-Version: 1.0
|
|
X-MTK: N
|
|
Sender: netdev-owner@vger.kernel.org
|
|
Precedence: bulk
|
|
List-ID: <netdev.vger.kernel.org>
|
|
X-Mailing-List: netdev@vger.kernel.org
|
|
|
|
Refine message in Kconfig with fixing typo and an explicit MT7621 support.
|
|
|
|
Signed-off-by: Landen Chao <landen.chao@mediatek.com>
|
|
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
---
|
|
drivers/net/dsa/Kconfig | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/Kconfig
|
|
+++ b/drivers/net/dsa/Kconfig
|
|
@@ -33,12 +33,12 @@ config NET_DSA_LANTIQ_GSWIP
|
|
the xrx200 / VR9 SoC.
|
|
|
|
config NET_DSA_MT7530
|
|
- tristate "Mediatek MT7530 Ethernet switch support"
|
|
+ tristate "MediaTek MT7530 and MT7621 Ethernet switch support"
|
|
depends on NET_DSA
|
|
select NET_DSA_TAG_MTK
|
|
---help---
|
|
- This enables support for the Mediatek MT7530 Ethernet switch
|
|
- chip.
|
|
+ This enables support for the MediaTek MT7530 and MT7621 Ethernet
|
|
+ switch chip.
|
|
|
|
config NET_DSA_MV88E6060
|
|
tristate "Marvell 88E6060 ethernet switch chip support"
|