linux-kernel - Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes 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: Sat, 6 Jan 2024 09:33:47 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Chuck Lever <chuck.lever@...cle.com>
Cc: Jeff Layton <jlayton@...nel.org>, Jeffrey Layton <jlayton@...hat.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, NeilBrown <neilb@...e.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes
 tree

Hi Chuck,

On Thu, 4 Jan 2024 22:51:07 -0500 Chuck Lever <chuck.lever@...cle.com> wrote:
>
> I plan to rebase nfsd-next as soon as 76d296a82657 ("nfsd: drop the
> nfsd_put helper") is merged. I'll have a closer look at this
> conflict tomorrow (my time).

Instead of rebasing your tree just before the merge window, why not
just merge nfsd-fixes into the nfsd tree?

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped