linux-next: duplicate patch in the nfsd tree

linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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

Re: linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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

Re: linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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

Re: linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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

linux-next: duplicate patch in the nfsd tree

[Stephen Rothwell]

[-- 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 --]

Re: linux-next: duplicate patch in the nfsd tree

[Chuck Lever III]

> 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