linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  tools/testing/selftests/net/forwarding/Makefile

between commit:

  f62c5acc800e ("selftests/net/forwarding: add missing tests to Makefile")

from the net tree and commit:

  50fe062c806e ("selftests: forwarding: new test, verify host mdb entries")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/net/forwarding/Makefile
index c87e674b61b1,ae80c2aef577..000000000000
--- a/tools/testing/selftests/net/forwarding/Makefile
+++ b/tools/testing/selftests/net/forwarding/Makefile
@@@ -2,7 -2,7 +2,8 @@@
  
  TEST_PROGS = bridge_igmp.sh \
  	bridge_locked_port.sh \
+ 	bridge_mdb.sh \
 +	bridge_mld.sh \
  	bridge_port_isolation.sh \
  	bridge_sticky_fdb.sh \
  	bridge_vlan_aware.sh \

Attachment: pgpiMuvCm9gc1.pgp
Description: OpenPGP digital signature