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/drivers/net/ping.py

between commit:

  75cc19c8ff89 ("selftests: drv-net: add xdp cases for ping.py")

from the net tree and commit:

  de94e8697405 ("selftests: drv-net: store addresses in dict indexed by ipver")

from the net-next tree.

I fixed it up (I think - 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/drivers/net/ping.py
index 93f4b411b378,17dc11e9b6dd..000000000000
--- a/tools/testing/selftests/drivers/net/ping.py
+++ b/tools/testing/selftests/drivers/net/ping.py
@@@ -1,34 -1,27 +1,34 @@@
  #!/usr/bin/env python3
  # SPDX-License-Identifier: GPL-2.0
  
 +import os
 +import random, string, time
  from lib.py import ksft_run, ksft_exit
 -from lib.py import ksft_eq
 -from lib.py import NetDrvEpEnv
 +from lib.py import ksft_eq, KsftSkipEx, KsftFailEx
 +from lib.py import EthtoolFamily, NetDrvEpEnv
  from lib.py import bkg, cmd, wait_port_listen, rand_port
 +from lib.py import ethtool, ip
  
 +remote_ifname=""
 +no_sleep=False
  
 -def test_v4(cfg) -> None:
 +def _test_v4(cfg) -> None:
-     cfg.require_v4()
+     cfg.require_ipver("4")
  
-     cmd(f"ping -c 1 -W0.5 {cfg.remote_v4}")
-     cmd(f"ping -c 1 -W0.5 {cfg.v4}", host=cfg.remote)
-     cmd(f"ping -s 65000 -c 1 -W0.5 {cfg.remote_v4}")
-     cmd(f"ping -s 65000 -c 1 -W0.5 {cfg.v4}", host=cfg.remote)
+     cmd("ping -c 1 -W0.5 " + cfg.remote_addr_v["4"])
+     cmd("ping -c 1 -W0.5 " + cfg.addr_v["4"], host=cfg.remote)
++    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.remote_addr_v["4"])
++    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.addr_v["4"], host=cfg.remote)
  
 -
 -def test_v6(cfg) -> None:
 +def _test_v6(cfg) -> None:
-     cfg.require_v6()
+     cfg.require_ipver("6")
  
-     cmd(f"ping -c 1 -W5 {cfg.remote_v6}")
-     cmd(f"ping -c 1 -W5 {cfg.v6}", host=cfg.remote)
-     cmd(f"ping -s 65000 -c 1 -W0.5 {cfg.remote_v6}")
-     cmd(f"ping -s 65000 -c 1 -W0.5 {cfg.v6}", host=cfg.remote)
 -    cmd("ping -c 1 -W0.5 " + cfg.remote_addr_v["6"])
 -    cmd("ping -c 1 -W0.5 " + cfg.addr_v["6"], host=cfg.remote)
++    cmd("ping -c 1 -W5 " + cfg.remote_addr_v["6"])
++    cmd("ping -c 1 -W5 " + cfg.addr_v["6"], host=cfg.remote)
++    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.remote_addr_v["6"])
++    cmd("ping -s 65000 -c 1 -W0.5 " + cfg.addr_v["6"], host=cfg.remote)
  
 -
 -def test_tcp(cfg) -> None:
 +def _test_tcp(cfg) -> None:
      cfg.require_cmd("socat", remote=True)
  
      port = rand_port()

Attachment: pgpMJnKAd_sPh.pgp
Description: OpenPGP digital signature