From: Chuck Lever III <chuck.lever@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the nfsd tree
Date: Mon, 16 Jan 2023 14:33:06 +0000 [thread overview]
Message-ID: <F7CFC18D-6AAC-4DAD-AA43-5C718FC1100E@oracle.com> (raw)
In-Reply-To: <53DEC27F-0AAC-4EFA-AB6E-0B5D44AACFB9@oracle.com>
> On Jan 12, 2023, at 6:25 PM, Chuck Lever III <chuck.lever@oracle.com> wrote:
>
>
>
>> On Jan 12, 2023, at 6:13 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi all,
>>
>> The following commit is also in cel-fixes tree as a different
>> commit (but the same patch):
>>
>> 3927ac397479 ("NFSD: register/unregister of nfsd-client shrinker at nfsd startup/shutdown time")
>>
>> (commit f385f7d24413 in the cel-fixes tree).
>
> Once nfsd's for-rc is merged into upstream, I will rebase
> nfsd's for-next and remove 3927ac397479. I intend to send
> a PR for for-rc after it's been in linux-next for a few
> days.
>
> Unfortunately there is a later patch in for-next that
> depends on 3927ac397479, so I can't remove it right at
> the moment.
Sorry, I wasn't clear. I need nfsd's for-rc to be picked
up and merged into linux-next before I send a PR.
I've trimmed for-next to temporarily remove the duplicate
commit, so you should now be able to continue merging both
into linux-next without an issue.
--
Chuck Lever
next prev parent reply other threads:[~2023-01-16 14:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 23:13 Stephen Rothwell
2023-01-12 23:25 ` Chuck Lever III
2023-01-16 14:33 ` Chuck Lever III [this message]
2023-01-17 0:52 ` Stephen Rothwell
2023-01-17 14:28 ` Chuck Lever III
2023-01-17 21:00 ` Stephen Rothwell
2023-01-17 21:23 ` Chuck Lever III
2023-01-17 21:48 ` Stephen Rothwell
2023-08-17 22:54 Stephen Rothwell
2023-08-18 13:29 ` Chuck Lever III
2024-01-07 21:19 Stephen Rothwell
2024-01-07 23:04 ` Chuck Lever III
2026-09-22 8:42 Mark Brown
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=F7CFC18D-6AAC-4DAD-AA43-5C718FC1100E@oracle.com \
--to=chuck.lever@oracle.com \
--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
all inboxes | Powered by JetHome®