* linux-next: duplicate patch in the nfsd tree
@ 2023-01-12 23:13 Stephen Rothwell
2023-01-12 23:25 ` Chuck Lever III
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-12 23:13 UTC (permalink / raw)
To: Chuck Lever; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
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).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
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
0 siblings, 1 reply; 12+ messages in thread
From: Chuck Lever III @ 2023-01-12 23:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
> 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.
--
Chuck Lever
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-12 23:25 ` Chuck Lever III
@ 2023-01-16 14:33 ` Chuck Lever III
2023-01-17 0:52 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Chuck Lever III @ 2023-01-16 14:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-16 14:33 ` Chuck Lever III
@ 2023-01-17 0:52 ` Stephen Rothwell
2023-01-17 14:28 ` Chuck Lever III
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-17 0:52 UTC (permalink / raw)
To: Chuck Lever III; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
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.
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?
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-17 0:52 ` Stephen Rothwell
@ 2023-01-17 14:28 ` Chuck Lever III
2023-01-17 21:00 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Chuck Lever III @ 2023-01-17 14:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-17 14:28 ` Chuck Lever III
@ 2023-01-17 21:00 ` Stephen Rothwell
2023-01-17 21:23 ` Chuck Lever III
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-17 21:00 UTC (permalink / raw)
To: Chuck Lever III; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]
Hi Chuck,
On Tue, 17 Jan 2023 14:28:42 +0000 Chuck Lever III <chuck.lever@oracle.com> wrote:
>
> > 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.
No worries.
> > 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?
Yes, that sounds good. Let me know when you have done that and I will
update my end. In the mean time, I will rename the cel-fixes tree to
nfsd-fixes.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-17 21:00 ` Stephen Rothwell
@ 2023-01-17 21:23 ` Chuck Lever III
2023-01-17 21:48 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Chuck Lever III @ 2023-01-17 21:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
> On Jan 17, 2023, at 4:00 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Chuck,
>
> On Tue, 17 Jan 2023 14:28:42 +0000 Chuck Lever III <chuck.lever@oracle.com> wrote:
>>
>>> 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.
>
> No worries.
>
>>> 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?
>
> Yes, that sounds good. Let me know when you have done that and I will
> update my end. In the mean time, I will rename the cel-fixes tree to
> nfsd-fixes.
That's now been done for-rc -> nfsd-fixes and for-next -> nfsd-next.
--
Chuck Lever
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-01-17 21:23 ` Chuck Lever III
@ 2023-01-17 21:48 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2023-01-17 21:48 UTC (permalink / raw)
To: Chuck Lever III; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
Hi Chuck,
On Tue, 17 Jan 2023 21:23:45 +0000 Chuck Lever III <chuck.lever@oracle.com> wrote:
>
> That's now been done for-rc -> nfsd-fixes and for-next -> nfsd-next.
I have updated here as well, thanks.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2024-01-07 21:19 Stephen Rothwell
@ 2024-01-07 23:04 ` Chuck Lever III
0 siblings, 0 replies; 12+ messages in thread
From: Chuck Lever III @ 2024-01-07 23:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
> On Jan 7, 2024, at 4:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
> 76d296a82657 ("nfsd: drop the nfsd_put helper")
>
> This is commit
>
> 64e6304169f1 ("nfsd: drop the nfsd_put helper")
>
> in Linus' tree.
Apparently my tool chain "touched" that commit after I pushed
it to nfsd-fixes but before I created the nfsd-6.7-3 tag. The
only difference I see between those two commits is the committer
date, and in my public git repo, git claims 76d296a82657 is not
on any branch.
I've reset the public nfsd-fixes branch to point to v6.7.
--
Chuck Lever
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the nfsd tree
@ 2024-01-07 21:19 Stephen Rothwell
2024-01-07 23:04 ` Chuck Lever III
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-01-07 21:19 UTC (permalink / raw)
To: Chuck Lever; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):
76d296a82657 ("nfsd: drop the nfsd_put helper")
This is commit
64e6304169f1 ("nfsd: drop the nfsd_put helper")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: duplicate patch in the nfsd tree
2023-08-17 22:54 Stephen Rothwell
@ 2023-08-18 13:29 ` Chuck Lever III
0 siblings, 0 replies; 12+ messages in thread
From: Chuck Lever III @ 2023-08-18 13:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeff Layton, Linux Kernel Mailing List, Linux Next Mailing List
> On Aug 17, 2023, at 6:54 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> The following commit is also in Linus Torvalds' tree as a different commit
> (but the same patch):
>
> 7f55e3c57a81 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
>
> This is commit
>
> c96e2a695e00 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
>
> in Linus' tree.
For the record, I've dropped 7f55e3c57a81 from nfsd-fixes. I'm at a loss
for why the commit hashes differ.
--
Chuck Lever
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: duplicate patch in the nfsd tree
@ 2023-08-17 22:54 Stephen Rothwell
2023-08-18 13:29 ` Chuck Lever III
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2023-08-17 22:54 UTC (permalink / raw)
To: Chuck Lever
Cc: Jeff Layton, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
Hi all,
The following commit is also in Linus Torvalds' tree as a different commit
(but the same patch):
7f55e3c57a81 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
This is commit
c96e2a695e00 ("sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-01-07 23:04 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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 NNTP newsgroup(s).