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: Tue, 17 Jan 2023 14:28:42 +0000 [thread overview]
Message-ID: <C72F2CC7-EB89-44D4-AC4A-C33EBED4B120@oracle.com> (raw)
In-Reply-To: <20230117115228.13b55d07@canb.auug.org.au>
> On Jan 16, 2023, at 7:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Chuck,
>
> On Mon, 16 Jan 2023 14:33:06 +0000 Chuck Lever III <chuck.lever@oracle.com> wrote:
>>
>> 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.
>
> I am not sure what you mean. Your for-rc branch has been in linux-next
> for a long time and the current version (SHA 7c24fa225081) was merged
> last Friday.
My bad. I was looking in the wrong place.
> For clarity, the cel-fixes tree and the nfsd tree are both branches of
> git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux - the for-rc
> and for-next branches respectively.
>
> Maybe I should rename cel-fixes to be nfsd-fixes?
Renaming my source branch as well would make things a little more clear.
How about I name the branches in my repo nfsd-next and nfsd-fixes?
--
Chuck Lever
next prev parent reply other threads:[~2023-01-17 14:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 23:13 linux-next: duplicate patch in the nfsd tree Stephen Rothwell
2023-01-12 23:25 ` Chuck Lever III
2023-01-16 14:33 ` Chuck Lever III
2023-01-17 0:52 ` Stephen Rothwell
2023-01-17 14:28 ` Chuck Lever III [this message]
2023-01-17 21:00 ` Stephen Rothwell
2023-01-17 21:23 ` Chuck Lever III
2023-01-17 21:48 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
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
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=C72F2CC7-EB89-44D4-AC4A-C33EBED4B120@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