From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chuck Lever III <chuck.lever@oracle•com>
Cc: 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 cel-fixes tree
Date: Tue, 13 Sep 2022 12:27:34 +1000 [thread overview]
Message-ID: <20220913122734.431114ef@canb.auug.org.au> (raw)
In-Reply-To: <2D1DCBBA-FC98-49D7-82CE-9CDA31BB72B6@oracle.com>
[-- Attachment #1: Type: text/plain, Size: 648 bytes --]
Hi Chuck,
On Tue, 13 Sep 2022 01:47:01 +0000 Chuck Lever III <chuck.lever@oracle•com> wrote:
>
> nfsd's for-next is currently based on v6.0-rc5, which does not have
> 00801cd92d91 ("NFSD: fix regression with setting ACLs.") yet. Next
> week I will rebase nfsd's for-next on v6.0-rc6, which should resolve
> this conflict. I will test the conflict resolution with the usual suite
> of NFSD check-in tests before pushing that update to for-next.
Why not just merge the cel-fixes tree into the nfsd tree (with this
fixup in the merge) and not pick up all the rest of -rc6. Also will
save a rebase ;-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-09-13 2:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 0:25 linux-next: manual merge of the nfsd tree with the cel-fixes tree Stephen Rothwell
2022-09-13 1:47 ` Chuck Lever III
2022-09-13 2:27 ` Stephen Rothwell [this message]
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=20220913122734.431114ef@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chuck.lever@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neilb@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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