From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 11 Jun 2026 21:29:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad4d4b92a9b9f0edb8c66deda049da1b62f6089;p=thirdparty%2Flinux.git

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

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

Conflicts:

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
  f67aead16e85 ("net: txgbe: rework service event handling")
  57d39faed4c9 ("net: txgbe: improve functions of AML 40G devices")

net/rds/info.c
  512db8267b73 ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
  6e94eeb2a2a6 ("rds: convert to getsockopt_iter")

Adjacent changes:

include/net/sock.h
  1ee90b77b727 ("net: guard timestamp cmsgs to real error queue skbs")
  f0de88303d5e ("net: make is_skb_wmem() available to modules")

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

dad4d4b92a9b9f0edb8c66deda049da1b62f6089
diff --cc net/rds/info.c
index 499b3774860ea,17061f6ff74e5..21b32eb165599
--- a/net/rds/info.c
+++ b/net/rds/info.c
@@@ -239,16 -230,13 +239,16 @@@ call_func
  		ret = lens.each;
  	}
  
 -	if (put_user(len, optlen))
 -		ret = -EFAULT;
 +	opt->optlen = len;
  
  out:
 -	if (pages)
 +	/*
 +	 * iov_iter_extract_pages() pins only user-backed (ubuf) iters;
 +	 * iov_iter_extract_will_pin() reports whether an unpin is owed here.
 +	 */
 +	if (pages && iov_iter_extract_will_pin(&opt->iter_out))
- 		unpin_user_pages(pages, nr_pages);
+ 		unpin_user_pages_dirty_lock(pages, nr_pages, true);
 -	kfree(pages);
 +	kvfree(pages);
  
  	return ret;
  }