Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 13 Sep 2022 12:27:34 +1000
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
Message-ID: <20220913122734.431114ef@canb.auug.org.au>
In-Reply-To: <2D1DCBBA-FC98-49D7-82CE-9CDA31BB72B6@oracle.com>
References: <20220913102507.3295ce32@canb.auug.org.au>
        <2D1DCBBA-FC98-49D7-82CE-9CDA31BB72B6@oracle.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NpK.SyNga.aF8h.P.IqyCm9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/NpK.SyNga.aF8h.P.IqyCm9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 ;-)

--=20
Cheers,
Stephen Rothwell

--Sig_/NpK.SyNga.aF8h.P.IqyCm9
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMf6pcACgkQAVBC80lX
0GxDvAf7BRN9hIkgL469ZK9f5afI+x/v95Ei8gsjbo8GwDHcI2ZTaAJ61A0swVVt
mlXe0s3ztHSnrWewuTxjFDr8nvgiq7iOOCaIbqawtqXdqcvpnjqmBbUEOiKglzOm
9KLQaN91p5kHbZfieg9gsWXJ0nV5OrBltdyVw8xGEx8hGRl1godG7ue+eJE07ZAM
XgHLnZrLEcFMyCcgW/gCUgIIaxiFAMBt15daIJFt+I1fuP82okmvJ04Vx3FCjjeY
s3PDnhXd+QzffOuJif959/GqgEeC/77qTxbDkGFd4Ri74JI3l2QTjGy7UBGNpEcj
pjG3uhf8iAjaRIIoISxorbygC3ZsDQ==
=bW7v
-----END PGP SIGNATURE-----

--Sig_/NpK.SyNga.aF8h.P.IqyCm9--