Date:   Tue, 24 Jan 2023 11:07:45 +1100
From:   Stephen Rothwell <sfr@rothwell.id.au>
To:     Damien Le Moal <damien.lemoal@opensource.wdc.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        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: <20230124110745.5c9b78b0@oak.ozlabs.ibm.com>
In-Reply-To: <87958074-baa4-b6c9-da0c-d654e4009611@opensource.wdc.com>
References: <20230124085951.59eb8da3@canb.auug.org.au>
        <1631b427-9efd-cd26-5dbc-0143097f859b@opensource.wdc.com>
        <20230124102535.1e21a533@canb.auug.org.au>
        <87958074-baa4-b6c9-da0c-d654e4009611@opensource.wdc.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YPDvbG7j3xU=w=361754An1";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/YPDvbG7j3xU=w=361754An1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Damien,

On Tue, 24 Jan 2023 08:30:29 +0900 Damien Le Moal <damien.lemoal@opensource=
.wdc.com> wrote:
>
> OK. I think I will merge the 3 patches that create the conflict and rebase
> the patches. I need that for retesting at least. But given the size of the
> conflict resolution, I may push that as an update to my for-6.3/for-next
> branch. Let me see...
>=20
> > Alternatively, just leave the fix up to Linus (but mention it to him
> > when you send your pull requests). =20
>=20
> Understood. Let me retest first :)

When I said "merge", I meant literally "git merge <some stable branch
from the vfs-mapping tree that contains the conflicting commit>" not
cherry pick the commits i.e. you would need to coordinate with
Christian about having a common branch (or making sure that the part of
his tree you pull in is immutable).

--=20
Cheers,
Stephen Rothwell

--Sig_/YPDvbG7j3xU=w=361754An1
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPPIVIACgkQAVBC80lX
0GxRDwf/fxiCI0xw9MtLUFRDGNETz1EvYNG8l1uF+wEnUoICM4TVd473Siuh01WL
qXNbGIRY1unql7e4nmmshEq8lON3cdOYy0kE0yhcvIOJ2qY6Pqg3AOM/sp6FyCev
2rprIKjVzEeMLqRgh69nFNCrBIJexSboTnhQbqsLmNxrR+lomE0zWOF9H5Ycib46
2VGlWgDEfxFOrHYCuTIcPm0iyqYsYUeXB4Ejnvu+YdmmLXP0mTbPsLugS4FsSaA+
zcNtggcbn/m4OB/nURLwhMf3BELUl10YTIsk660auBBs+DWwQyODYNK7hDBfT2rA
ErfBzndFmIYJpiNC87OLkKJ8cGrJVQ==
=YZlu
-----END PGP SIGNATURE-----

--Sig_/YPDvbG7j3xU=w=361754An1--