Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Date:   Wed, 11 Oct 2023 11:24:08 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>
Cc:     David Sterba <dsterba@suse.cz>,
        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: <20231011112408.3198553d@canb.auug.org.au>
In-Reply-To: <20231011083754.45a9ed53@canb.auug.org.au>
References: <20231009104840.1bdadc80@canb.auug.org.au>
        <20231009-bauch-gedanken-e02e35804e03@brauner>
        <20231011083754.45a9ed53@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ecmSwi50C5cpoi7gt+qpF6W";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Wed, 11 Oct 2023 08:37:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner <brauner@kernel.org> =
wrote:
> > =20
> > > I have dropped the vfs-brauner tree for today as there is no way I can
> > > sort them out in a reasonable time.  Please sort this out between
> > > yourselves.   =20
> >=20
> > I'll fix that up! =20
>=20
> The btrfs tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next)
> has moved again.  I don't know (yet) if this will cause conflicts
> again, but there is a good chance that it will.

Yeah, I got those conflicts again, so dropped your tree again.

--=20
Cheers,
Stephen Rothwell

--Sig_/ecmSwi50C5cpoi7gt+qpF6W
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUl6ygACgkQAVBC80lX
0GxrxQf+JfApwoJ+ab81MazfZuL4WZXzL/MG+QYPjemdd8AfaqGTMzqPHdx5BIF7
H7zHkBPiKzUV3xCd4+/LUJ+qjWTSPNdnVFvBvVpw7fMhn4JFkDBHXkJ9kzQ7RVNJ
OMGA6wxW+LjR92lOO3SEGQeNfZAQ9XYgsOHoZCkckl3F5xX0QtAMdWMdN8AgDXDb
1wuS5R+zio8qw16tS4DC+1Kor49P8mHKqIr3wd6VYRxf5k+neGAAG1iBHMVBWEmE
T+M3tAR6PbNoX3XEJu7mhJhlXsT5RaD+ciEcedSuMWu6y3p2tv9MjoLQ/+Ff83Ku
MSqtmOvRGitxyel/w6n8ABNtbMlW6A==
=qTxv
-----END PGP SIGNATURE-----

--Sig_/ecmSwi50C5cpoi7gt+qpF6W--