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] [day] [month] [year] [list]

Message-ID: <20240106114522.3c06e732@canb.auug.org.au>
Date: Sat, 6 Jan 2024 11:45:22 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Chuck Lever III <chuck.lever@...cle.com>
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

Hi Chuck,

On Sat, 6 Jan 2024 00:26:53 +0000 Chuck Lever III <chuck.lever@...cle.com> wrote:
>
> 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.

Understood, but if you are interested, see
Documentation/maintainer/rebasing-and-merging.rst

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped