From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from stravinsky.debian.org (stravinsky.debian.org [82.195.75.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B536D30F7E8; Fri, 12 Jun 2026 08:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.195.75.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781252374; cv=none; b=fRh9t6RRmibMZBPuf5cGQe3SvOHX+w8CPYCOZNSzFmViTL/hR9LJOLVCo8rWPoQyCIBfZX2FCZ+WEh2njyapkHo/eCbJpezU73sv1ogr/scWOl25bUfIEQzmYq43+yQyaO8Q3Kx0udOVXzUJGy0aBJNTk5dPKRFWvCLf4XEKhLs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781252374; c=relaxed/simple; bh=DDb390pH86F+MDAKPh2YrcsD3VaZg2jS2rjKd2DBMYw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=b6stgTr3v0rIronpXt3XNZlR6iZfBxI17waNy+HCmgjhas1ebEmdV4CzoSdfhzmsyVH1mUn3PGA9a+0StcuGct0AdSolXnIkSgaWodv0HuPejVCaJa3Rfq0ftwQ1F505dBagGBv+9UoVuKtavyjCs4lQjPsxM0rJLjD5Eu/Dnvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=debian.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b=U4JRN5Oz; arc=none smtp.client-ip=82.195.75.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=debian.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=debian.org header.i=@debian.org header.b="U4JRN5Oz" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; s=smtpauto.stravinsky; h=X-Debian-User:In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=p3Oqjlj/auX5F9Pcu1687Su6+uFqsB+j7WxdEnNQCQg=; b=U4JRN5OzVWPkFIz8k+tXNZuqX2 m84pOgKMjluRHVI+0+jIhucCVfJc6M/1y2m7BW4K3eZpZp/xCf/ba/xs1Wu7qrkuzPbvL/18FPlRC 8q1PYPOWoh7Mukd/cilKaG16Eif4ZcFaxjbUr7amvYo9xOs4ov0ag8F9Vlv/EwnetNfepbHnKIKUc 1PSNGQy45UAcgg980DBjmV1NTtuJtOw86Hu+xJ9YgEdrt6qtsxcjxg1Vv2DSAPcXg0b1rHPqXi+Ke OokErsv2t4k0Ye9VDkaQKLURaJccAZVyS6zBKpyQMiUU2eOtW/CAzDlUZk0I1YFdS4GHkpvixChNe 2uvD6fkg==; Received: from authenticated-user by stravinsky.debian.org with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1wXx6s-00AbGb-16; Fri, 12 Jun 2026 08:19:26 +0000 Date: Fri, 12 Jun 2026 01:19:21 -0700 From: Breno Leitao To: Matthieu Baerts Cc: Allison Henderson , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-kselftest@vger.kernel.org, kernel-team@meta.com, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Andy Grover , Mark Brown , Linux Next Mailing List Subject: Re: [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge Message-ID: References: <20260608-getsock_more-v3-0-706ecf2ea332@debian.org> <20260608-getsock_more-v3-2-706ecf2ea332@debian.org> <2e1b0534-a1a0-4eb1-a5e2-d42fcf991188@kernel.org> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2e1b0534-a1a0-4eb1-a5e2-d42fcf991188@kernel.org> X-Debian-User: leitao Hello Matthieu, On Thu, Jun 11, 2026 at 02:52:36PM +0200, Matthieu Baerts wrote: > > + /* > > + * 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); > > FYI, we got a small conflict when merging 'net' in 'net-next' in the > MPTCP tree due to this patch applied in 'net': > > f512db8267b73 ("rds: mark snapshot pages dirty in rds_info_getsockopt()") > > and this one from 'net-next': > > 6e94eeb2a2a6 ("rds: convert to getsockopt_iter") I was aware of the conflict but didn't realize a note would be helpful for the merge. I should have included one. Could you point me to an example commit/patch that contains such a note so I can understand the expected format and procedure? Apologies for the omission. --breno