From: Chuck Lever <chuck.lever@oracle•com>
To: Trond Myklebust <trondmy@hammerspace•com>,
"jlayton@kernel•org" <jlayton@kernel•org>
Cc: "sfr@canb•auug.org.au" <sfr@canb•auug.org.au>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfs tree
Date: Fri, 21 Mar 2025 09:40:54 -0400 [thread overview]
Message-ID: <1b8ee72d-73c0-49f6-bdaa-14faf712f5d1@oracle.com> (raw)
In-Reply-To: <c4d6be529fb349f43b853ab701c5ebc70bfe43d6.camel@hammerspace.com>
On 3/21/25 9:37 AM, Trond Myklebust wrote:
> On Fri, 2025-03-21 at 09:32 -0400, Chuck Lever wrote:
>> On 3/20/25 6:11 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the nfsd tree got a conflict in:
>>>
>>> fs/nfsd/nfs4callback.c
>>>
>>> between commit:
>>>
>>> 11a149e09d58 ("sunrpc: make rpc_restart_call() and
>>> rpc_restart_call_prepare() void return")
>>>
>>> from the nfs tree and commits:
>>>
>>> 6c1cefb84b3d ("nfsd: lift NFSv4.0 handling out of
>>> nfsd4_cb_sequence_done()")
>>> f049911b5b98 ("nfsd: only check RPC_SIGNALLED() when restarting
>>> rpc_task")
>>>
>>> from the nfsd tree.
>>>
>>> I fixed it up (see below) and can carry the fix as necessary. 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.
>>
>> Since 11a149e09d58 is only clean up, I prefer that it be dropped from
>> the nfs tree until v6.16. Trond, if you don't want to do that, then I
>> can include a merge conflict notice in my pull request for v6.15.
>>
>>
>
> Removed and rebased.
>
Thanks Trond and Stephen!
--
Chuck Lever
next prev parent reply other threads:[~2025-03-21 13:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 22:11 linux-next: manual merge of the nfsd tree with the nfs tree Stephen Rothwell
2025-03-21 13:32 ` Chuck Lever
2025-03-21 13:37 ` Trond Myklebust
2025-03-21 13:40 ` Chuck Lever [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-24 23:59 Stephen Rothwell
2021-10-25 0:10 ` Stephen Rothwell
2015-02-10 0:55 Stephen Rothwell
2015-02-10 15:34 ` J. Bruce Fields
2009-08-10 0:58 Stephen Rothwell
2009-08-10 16:05 ` J. Bruce Fields
2009-08-10 18:08 ` Trond Myklebust
2009-08-10 18:17 ` J. Bruce Fields
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=1b8ee72d-73c0-49f6-bdaa-14faf712f5d1@oracle.com \
--to=chuck.lever@oracle$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=trondmy@hammerspace$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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