Re: linux-next: manual merge of the vfs-brauner tree with the btrfs tree
From: Stephen Rothwell
Date: Tue Oct 10 2023 - 17:38:04 EST
Hi Christian,
On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner <brauner@xxxxxxxxxx> wrote:
>
> > 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.
>
> I'll fix that up!
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.
--
Cheers,
Stephen Rothwell
Attachment:
pgpBwiKke1Pww.pgp
Description: OpenPGP digital signature