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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/net/Makefile

between commit:

  1a01727676a8 ("selftests: Add VRF route leaking tests")

from the net tree and commit:

  b7cc6d3c5c91 ("selftests: net: Add drop monitor test")

from the wireless-drivers (presumably because it has merged part of the
net-next tree) 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/Makefile
index 3e7fb1e70c77,4773ce72edbd..000000000000
--- a/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -19,7 -19,7 +19,8 @@@ TEST_PROGS += txtimestamp.s
  TEST_PROGS += vrf-xfrm-tests.sh
  TEST_PROGS += rxtimestamp.sh
  TEST_PROGS += devlink_port_split.py
+ TEST_PROGS += drop_monitor_tests.sh
 +TEST_PROGS += vrf_route_leaking.sh
  TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket nettest
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any

Attachment: pgpwmFNwFA3hp.pgp
Description: OpenPGP digital signature