From: Breno Leitao <leitao@debian.org>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: Allison Henderson <achender@kernel.org>,
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" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Shuah Khan <shuah@kernel.org>,
Andy Grover <andy.grover@oracle.com>,
Mark Brown <broonie@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge
Date: Fri, 12 Jun 2026 01:19:21 -0700 [thread overview]
Message-ID: <aivAbAIjnTeqlsdS@gmail.com> (raw)
In-Reply-To: <2e1b0534-a1a0-4eb1-a5e2-d42fcf991188@kernel.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
next prev parent reply other threads:[~2026-06-12 8:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260608-getsock_more-v3-0-706ecf2ea332@debian.org>
[not found] ` <20260608-getsock_more-v3-2-706ecf2ea332@debian.org>
2026-06-11 12:52 ` [PATCH net-next v3 2/2] rds: convert to getsockopt_iter: manual merge Matthieu Baerts
2026-06-11 18:35 ` Allison Henderson
2026-06-12 8:19 ` Breno Leitao [this message]
2026-06-12 11:41 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aivAbAIjnTeqlsdS@gmail.com \
--to=leitao@debian.org \
--cc=achender@kernel.org \
--cc=andy.grover@oracle.com \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=matttbe@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rds-devel@oss.oracle.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox