From: David S. Miller Date: Tue, 9 Feb 2021 00:20:58 +0000 (-0800) Subject: Merge branch 'bridge-mrp' X-Git-Tag: accepted/tizen/unified/20230118.172025~7924^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'bridge-mrp' Horatiu Vultur says: ==================== bridge: mrp: Fix br_mrp_port_switchdev_set_state Based on the discussion here[1], there was a problem with the function br_mrp_port_switchdev_set_state. The problem was that it was called both with BR_STATE* and BR_MRP_PORT_STATE* types. This patch series fixes this issue and removes SWITCHDEV_ATTR_ID_MRP_PORT_STAT because is not used anymore. [1] https://www.spinics.net/lists/netdev/msg714816.html ==================== Signed-off-by: David S. Miller --- 6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c