From: Chuck Lever <chuck.lever@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeff Layton <jlayton@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
Date: Tue, 15 Aug 2023 09:49:00 -0400 [thread overview]
Message-ID: <ZNuCTMg2NS4d3xhf@tissot.1015granger.net> (raw)
In-Reply-To: <20230815110627.5d985043@canb.auug.org.au>
On Tue, Aug 15, 2023 at 11:06:27AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the nfsd tree got a conflict in:
>
> net/sunrpc/svcsock.c
>
> between commit:
>
> c96e2a695e00 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
>
> from the nfsd-fixes tree and commit:
>
> 62c25ceb29a6 ("SUNRPC: Convert svc_tcp_sendmsg to use bio_vecs directly")
>
> from the nfsd tree.
>
> I fixed it up (I just used the latter) and can carry the fix as
> necessary.
Thanks, using the latter is the correct fix. I will address this in
my repo, since c96e2a695e00 is destined for v6.5-rc soon.
> This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
--
Chuck Lever
next prev parent reply other threads:[~2023-08-15 13:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 1:06 linux-next: manual merge of the nfsd tree with the nfsd-fixes tree Stephen Rothwell
2023-08-15 13:49 ` Chuck Lever [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 0:00 Stephen Rothwell
2024-01-05 3:51 ` Chuck Lever
2024-01-05 22:33 ` Stephen Rothwell
2024-01-06 0:26 ` Chuck Lever III
2024-01-06 0:45 ` Stephen Rothwell
2024-04-24 0:07 Stephen Rothwell
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=ZNuCTMg2NS4d3xhf@tissot.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).