From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9B5433EB118; Fri, 12 Jun 2026 11:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781264469; cv=none; b=p01VVgyMCzH1u4TNI0F9ECW5ZrxWOV7FikKYZHBKuHDDEDl6PpFdFRlDOY9dvdNk2Izb5DglmJhVWf6+Lu63xwRjRZeJxp5VhbhHoXEBPb1WIfO0IDsRlC9HaOlX61qUBumpyRxkuQEOJoBVdss/gufroj4/k+E847pQB7HpDDc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781264469; c=relaxed/simple; bh=IXHJOU0oLy6l03pAmfv5nGYKFNT71fN5FVctAoo/kOo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=MfywUnNE6TanL467BIDW7Cq0HMfQYH/BWII/iMuV0kUsNAHmBjOd6yFK+v3GT/vNv7PHEp0daQFWdJ9dtKm8k5+JbvgvsJekYFwdGgQrCaftrUr0jLTov/SsEcWMYs5DIfEFCVCGP5xBiLmuijkYKeFw/7oZUUyen2f3nHUJjAY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DueXUBEF; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DueXUBEF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 036751F000E9; Fri, 12 Jun 2026 11:41:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781264468; bh=GsP/OcYc2aQ8nhYpNO2oEoNFkMgUJ4z8n0SYStJlwzc=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=DueXUBEFLOOMTmTcr7WzT0cS5vI6MeEZOQNLd3vYFbo6ttwHHajZxUHzL1oQ9JCJR ZvUTeY0K5Hi/YCgjK1IJCYjgCdixmIePj/oD2xPAqnb+DsH/dqebqMdQ2Q8QV8FM4L Z+s/US1gYUG4rSKyr/wEgK4nRpkQN6w8QhVu1pVkEAY/bDFUrLK4XrEoqTgOxyGtpR neEp9cOQeZrynheX+/DyZUe52Fbe/czpAYpfHY8NLvab14thzjB3ESjId2FszpFPlK Ydpln4w8GZ/eSB0L8eRtClF6vRYvW7auNzMlQpacZY6Gb9V14HBKWoxppU3e7TadGX FuNIrsJ/33H7A== Message-ID: Date: Fri, 12 Jun 2026 13:41:00 +0200 Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge Content-Language: fr To: Breno Leitao 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 References: <20260608-getsock_more-v3-0-706ecf2ea332@debian.org> <20260608-getsock_more-v3-2-706ecf2ea332@debian.org> <2e1b0534-a1a0-4eb1-a5e2-d42fcf991188@kernel.org> From: Matthieu Baerts Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Breno, On 12/06/2026 10:19, Breno Leitao wrote: > 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? In this particular example, I think it would have been easier to have waited for the fix to land in net-next -- after the weekly sync with net -- and then send the net-next patches. When this cannot be avoided, then you can mention the conflict, and ideally share a diff of the resolution, plus a description, especially when it is not obvious, when simply saying "take the version from X" is helpful, when extra modifications are needed, etc. e.g. [1]. Something similar to what Mark is usually doing on the linux-next ML, or what I did here. [1] https://lore.kernel.org/98386125-c0bb-495e-b2ba-2765aaed19d8@oss.qualcomm.com > Apologies for the omission. No problem, it happens fairly regularly ;) Cheers, Matt -- Sponsored by the NGI0 Core fund.