From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: Jeff Layton <jlayton@kernel.org>,
Jeffrey Layton <jlayton@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
Date: Sat, 6 Jan 2024 09:33:47 +1100 [thread overview]
Message-ID: <20240106093347.15810e18@canb.auug.org.au> (raw)
In-Reply-To: <ZZd8q4RSTTN/5wSq@tissot.1015granger.net>
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Hi Chuck,
On Thu, 4 Jan 2024 22:51:07 -0500 Chuck Lever <chuck.lever@oracle.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-05 22:33 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 [this message]
2024-01-06 0:26 ` Chuck Lever III
2024-01-06 0:45 ` Stephen Rothwell
-- 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=20240106093347.15810e18@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