From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 May 2021 20:20:24 +0000 (-0700)
Subject: Merge branch 'sja1105-fixes'
X-Git-Tag: v5.13-rc4~29^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=93c5d741d14b86150e10100de3d85f999e77a03c;p=users%2Fdwmw2%2Flinux.git

Merge branch 'sja1105-fixes'

Vladimir Oltean says:

====================
Fixes for SJA1105 DSA driver

This series contains some minor fixes in the sja1105 driver:
- improved error handling in the probe path
- rejecting an invalid phy-mode specified in the device tree
- register access fix for SJA1105P/Q/R/S for the virtual links through
  the dynamic reconfiguration interface
- handling 2 bridge VLANs where the second is supposed to overwrite the
  first
- making sure that the lack of a pvid results in the actual dropping of
  untagged traffic
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

93c5d741d14b86150e10100de3d85f999e77a03c