From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 1 Dec 2023 00:10:40 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=975f2d73a99f35b57ffa2ad7bff8562225cdcfcb;p=linux.git

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

Cross-merge networking fixes after downstream PR.

No conflicts.

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

975f2d73a99f35b57ffa2ad7bff8562225cdcfcb
diff --cc tools/testing/selftests/net/cmsg_sender.c
index 8d7575389f58,6ff3e732f449..c79e65581dc3
--- a/tools/testing/selftests/net/cmsg_sender.c
+++ b/tools/testing/selftests/net/cmsg_sender.c
@@@ -428,12 -416,11 +428,12 @@@ int main(int argc, char *argv[]
  {
  	struct addrinfo hints, *ai;
  	struct iovec iov[1];
+ 	unsigned char *buf;
  	struct msghdr msg;
  	char cbuf[1024];
- 	char *buf;
  	int err;
  	int fd;
 +	int i;
  
  	cs_parse_args(argc, argv);