Merge branch 'net-Fix-bridge-enslavement-failure'
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Sep 2020 22:06:48 +0000 (15:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Sep 2020 22:06:48 +0000 (15:06 -0700)
commitcdaa7a73700d40ffb4250b845422e4c4102feab5
tree4bcc4e0e4cef199387f852ec4f6bfe07f0f0f59b
parent9d3b2d3e4942cb82630f0d638de4b2253c0af56d
parent6374a5606990ea4de7fe0f7035dd04422c4690f5
Merge branch 'net-Fix-bridge-enslavement-failure'

Ido Schimmel says:

====================
net: Fix bridge enslavement failure

Patch #1 fixes an issue in which an upper netdev cannot be enslaved to a
bridge when it has multiple netdevs with different parent identifiers
beneath it.

Patch #2 adds a test case using two netdevsim instances.
====================

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