From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chuck Lever III <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>,
Jeff Layton <jlayton@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Neil Brown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
Date: Sat, 6 Jan 2024 11:45:22 +1100 [thread overview]
Message-ID: <20240106114522.3c06e732@canb.auug.org.au> (raw)
In-Reply-To: <A65DB9F5-8777-430E-8BDB-F2AD2E073A25@oracle.com>
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi Chuck,
On Sat, 6 Jan 2024 00:26:53 +0000 Chuck Lever III <chuck.lever@oracle.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-06 0:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 0:00 linux-next: manual merge of the nfsd tree with the nfsd-fixes tree Stephen Rothwell
2024-01-05 3:51 ` Chuck Lever
2024-01-05 22:33 ` Stephen Rothwell
2024-01-06 0:26 ` Chuck Lever III
2024-01-06 0:45 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-24 0:07 Stephen Rothwell
2023-08-15 1:06 Stephen Rothwell
2023-08-15 13:49 ` Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240106114522.3c06e732@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox