Commit f4915933 authored by Paolo Abeni's avatar Paolo Abeni
Browse files


Cross-merge networking fixes after downstream PR (net-6.14-rc8).

Conflict:

tools/testing/selftests/net/Makefile
  03544faa ("selftest: net: add proc_net_pktgen")
  3ed61b89 ("selftests: net: test for lwtunnel dst ref loops")

tools/testing/selftests/net/config:
  85cb3711 ("selftests: net: Add test cases for link and peer netns")
  3ed61b89 ("selftests: net: test for lwtunnel dst ref loops")

Adjacent commits:

tools/testing/selftests/net/Makefile
  c935af42 ("selftests: net: add support for testing SO_RCVMARK and SO_RCVPRIORITY")
  355d940f ("Revert "selftests: Add IPv6 link-local address generation tests for GRE devices."")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 6855b9be 5fc31936
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment