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 00:26:53 +0000
From: Chuck Lever III <chuck.lever@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: Jeff Layton <jlayton@...nel.org>, Jeff Layton <jlayton@...hat.com>,
        Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List
	<linux-next@...r.kernel.org>,
        Neil Brown <neilb@...e.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes
 tree



> On Jan 5, 2024, at 5:33 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> 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?

My development toolchain is stgit, where rebasing is butt-
simple.

I'm not smart enough to make all that work out, and merges
make my head hurt. That's why I let you and Linus handle it,
and then never rebase once my PRs are merged into
torvalds/linux.git.

I'm open to learning more, but I might resist making my dev
workflow more complicated.


--
Chuck Lever