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

[Mark Brown]

Hi all,

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

  tools/testing/selftests/drivers/net/hw/rss_ctx.py

between commit:

  ce5a0f4612dba ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")

from the net tree and commit:

  19c3a2a81d2bc ("selftests: drv-net: rss: Generate unique ports for RSS context tests")

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.

diff --cc tools/testing/selftests/drivers/net/hw/rss_ctx.py
index b9b7527c2c6b9,cbeb3a38fdfeb..0000000000000
--- a/tools/testing/selftests/drivers/net/hw/rss_ctx.py
+++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py
@@@ -10,9 -9,8 +10,9 @@@ from lib.py import ksft_eq, ksft_ne, ks
  from lib.py import NetDrvEpEnv
  from lib.py import EthtoolFamily, NetdevFamily
  from lib.py import KsftSkipEx, KsftFailEx
 +from lib.py import ksft_disruptive
- from lib.py import rand_port
+ from lib.py import rand_port, rand_ports
 -from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure
 +from lib.py import cmd, ethtool, ip, defer, GenerateTraffic, CmdExitFailure, wait_file
  
  
  def _rss_key_str(key):

Attachment: signature.asc
Description: PGP signature