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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 16 Jan 2023 14:33:06 +0000
From:   Chuck Lever III <chuck.lever@...cle.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the nfsd tree



> On Jan 12, 2023, at 6:25 PM, Chuck Lever III <chuck.lever@...cle.com> wrote:
> 
> 
> 
>> On Jan 12, 2023, at 6:13 PM, Stephen Rothwell <sfr@...b.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