Re: [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge

[Breno Leitao <leitao@debian.org>]

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