Date:   Tue, 24 Jan 2023 10:25:35 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Damien Le Moal <damien.lemoal@opensource.wdc.com>
Cc:     Damien Le Moal <Damien.LeMoal@wdc.com>,
        Christian Brauner <christian@brauner.io>,
        Seth Forshee <sforshee@kernel.org>,
        Christian Brauner <brauner@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the zonefs tree with the
 vfs-idmapping tree
Message-ID: <20230124102535.1e21a533@canb.auug.org.au>
In-Reply-To: <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
References: <20230124085951.59eb8da3@canb.auug.org.au>
        <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GtDDnJowhG8fN4yNaXopEnV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/GtDDnJowhG8fN4yNaXopEnV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Damien,

On Tue, 24 Jan 2023 07:31:18 +0900 Damien Le Moal <damien.lemoal@opensource=
.wdc.com> wrote:
>
> Thanks for that. Do you want me to rebase my for-6.3/for-next branch on
> these patches ? I need to retest everything anyway, so I might as well do
> that.

You can only rebase on top of the vfs-idmapping tree if you get a
guarantee that it is immutable.  In any case, it may be better to merge
(an immutable subset) of the vfs-idmapping tree (and fix up the
conflicts) rather than rebasing on top of it.

Alternatively, just leave the fix up to Linus (but mention it to him
when you send your pull requests).
--=20
Cheers,
Stephen Rothwell

--Sig_/GtDDnJowhG8fN4yNaXopEnV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPPF28ACgkQAVBC80lX
0GyZvAf/ZS2Lytc34PCFjjD1bOjOsR40tOvDtk8J3JwYqczH/+HiK0YqLy2ByjVO
FB4sPFRU4+w8ROmyX/nUKYQAiVg/MIrOMSPaKu+kXiCSY3CaDz1Fhu8HQ0o1a+Lh
+z3TEe/c/MFywoaevk6u9OrmqwDj/BHxLlw0fLJcQYv0aWFbmn6MvQJ/G0SDGNSK
AAsy12faGicP7G4V2exrHXeY1W7BLYAuT4qy0SkbZxPrUiPZhWECYCIe0QQ+XC/w
dGJrRcQ+CEw7dAR93gLttJJWVOMdXR8yerpdKL1gNsUbq3ePtS8OnhyrtO9DlXsi
3WBxlyPYLUlGnBKeSJsVIv9rAGSgWw==
=ONWF
-----END PGP SIGNATURE-----

--Sig_/GtDDnJowhG8fN4yNaXopEnV--