From: David S. Miller Date: Tue, 31 Mar 2020 02:55:42 +0000 (-0700) Subject: Merge branch 'net-dsa-b53-and-bcm_sf2-updates-for-7278' X-Git-Tag: v5.7-rc1~146^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60d79ab33c4cc3c7b563cadea9e5bcf43e6e3951;p=thirdparty%2Flinux.git Merge branch 'net-dsa-b53-and-bcm_sf2-updates-for-7278' Florian Fainelli says: ==================== net: dsa: b53 & bcm_sf2 updates for 7278 This patch series contains some updates to the b53 and bcm_sf2 drivers specifically for the 7278 Ethernet switch. The first patch is technically a bug fix so it should ideally be backported to -stable, provided that Dan also agress with my resolution on this. Patches #2 through #4 are minor changes to the core b53 driver to restore VLAN configuration upon system resumption as well as deny specific bridge/VLAN operations on port 7 with the 7278 which is special and does not support VLANs. Patches #5 through #9 add support for matching VLAN TCI keys/masks to the CFP code. Changes in v2: - fixed some code comments and arrange some code for easier reading ==================== Signed-off-by: David S. Miller --- 60d79ab33c4cc3c7b563cadea9e5bcf43e6e3951