Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Tue, 24 Oct 2023 08:25:43 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     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 vfs-brauner tree with the btrfs
 tree
Message-ID: <20231024082543.575b3edd@canb.auug.org.au>
In-Reply-To: <20231023175513.GL26353@twin.jikos.cz>
References: <20231009104840.1bdadc80@canb.auug.org.au>
        <20231009-bauch-gedanken-e02e35804e03@brauner>
        <20231011083754.45a9ed53@canb.auug.org.au>
        <20231011092004.GE2211@suse.cz>
        <20231012154210.GI2211@suse.cz>
        <20231023175513.GL26353@twin.jikos.cz>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/AT3nUgAc7rvRCgMGlJb6co9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi David,

On Mon, 23 Oct 2023 19:55:13 +0200 David Sterba <dsterba@suse.cz> wrote:
>
> I have updated my for-next branch again, sorry (top commit 1a4dc97c883a4f=
763cbaf50).
> There are some fixes I don't want to miss from the 6.7 pull request.
> There should be minimal change to the VFS tree conflict resolution so
> the diff should be reusable.

So, why did you not just merge in v6.6-rc7 (or better yet, the branch
that contains the fix(es) that Linus merged) and then apply your new
commits on top of that?  All the commits that were in the btrfs tree
have been rebased unchanged.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU25NcACgkQAVBC80lX
0GzE9gf+OuDtCnNFpw5eqx1zq5PigPgMZgPbQ9glGv+ObDUVGNxi+IbhqKgKTCux
UbviCpVeHt5aqXqlWLdLt5jpQPrR6QfUuadeBr6b5sP4INvdmYpo9fwqCKgRNecu
rS1Uf2cOAKZNUimMMBYjfcPY7DywuGoLl9Ue0i4+bqfcK7MxPQ0IP8eOyzOaw8AT
Dvrz07vu9M9jlZWaIy2FE0KHomWQeMFwsKd9Xlggm6JpZDB1I9hH5HoI5MS3/cxQ
FmUOZz8kLMoIJw3UXV961DKizjOgEqDI+qaPKWiN9UE2ZAMsLoagKImz8JcJXvlB
/GL00jvoUWH1IpCTGCxYekPS+4Q18w==
=v3KC
-----END PGP SIGNATURE-----

--Sig_/AT3nUgAc7rvRCgMGlJb6co9--