From: David S. Miller Date: Mon, 2 Nov 2015 20:40:11 +0000 (-0500) Subject: Merge branch 'bridge_vlan_fixes' X-Git-Tag: firefly_0821_release~176^2~818^2~25 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21086b990ba51d12670eba342eec76d4bba55d33;p=firefly-linux-kernel-4.4.55.git Merge branch 'bridge_vlan_fixes' Nikolay Aleksandrov says: ==================== bridge: vlan: failure path and comment fixes This is a set from Ido which takes care of one failure path error in nbp_vlan_init (patch 1) and a few comment errors (patch 2). I must admit I didn't expect the port init continues after a vlan init failure but should've checked to make sure. Thanks to Ido for catching these! ==================== Signed-off-by: David S. Miller --- 21086b990ba51d12670eba342eec76d4bba55d33