From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 23 Jun 2023 01:40:38 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.6.17~4555^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7384f3918756c193e3fcd7e3111fc4bd3686013;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

tools/testing/selftests/net/fcnal-test.sh
  d7a2fc1437f7 ("selftests: net: fcnal-test: check if FIPS mode is enabled")
  dd017c72dde6 ("selftests: fcnal: Test SO_DONTROUTE on TCP sockets.")
https://lore.kernel.org/all/5007b52c-dd16-dbf6-8d64-b9701bfa498b@tessares.net/
https://lore.kernel.org/all/20230619105427.4a0df9b3@canb.auug.org.au/

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

a7384f3918756c193e3fcd7e3111fc4bd3686013
diff --cc tools/testing/selftests/net/fcnal-test.sh
index 05b5c4a,ee6880a..d32a14b
--- a/tools/testing/selftests/net/fcnal-test.sh
+++ b/tools/testing/selftests/net/fcnal-test.sh
@@@ -1283,10 -1223,7 +1290,10 @@@ ipv4_tcp_novrf(
  	run_cmd nettest -d ${NSA_DEV} -r ${a}
  	log_test_addr ${a} $? 1 "No server, device client, local conn"
  
- 	ipv4_tcp_md5_novrf
+ 	[ "$fips_enabled" = "1" ] || ipv4_tcp_md5_novrf
 +
 +	ipv4_tcp_dontroute 0
 +	ipv4_tcp_dontroute 2
  }
  
  ipv4_tcp_vrf()