From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 20 Nov 2025 17:12:41 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.19-rc1~170^2~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e203721ec6117b2f4436a26662413764fd669f0;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.18-rc7).

No conflicts, adjacent changes:

tools/testing/selftests/net/af_unix/Makefile
  e1bb28bf13f4 ("selftest: af_unix: Add test for SO_PEEK_OFF.")
  45a1cd8346ca ("selftests: af_unix: Add tests for ECONNRESET and EOF semantics")

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

9e203721ec6117b2f4436a26662413764fd669f0
diff --cc tools/testing/selftests/net/af_unix/Makefile
index 5826a83724518,528d14c598bb5..3cd677b720728
--- a/tools/testing/selftests/net/af_unix/Makefile
+++ b/tools/testing/selftests/net/af_unix/Makefile
@@@ -6,8 -6,8 +6,9 @@@ TEST_GEN_PROGS := 
  	scm_inq \
  	scm_pidfd \
  	scm_rights \
+ 	so_peek_off \
  	unix_connect \
 +	unix_connreset \
  # end of TEST_GEN_PROGS
  
  include ../../lib.mk