Messages in this thread | | | Date | Wed, 11 Oct 2023 08:37:54 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the vfs-brauner tree with the btrfs tree |
| |
Hi Christian,
On Mon, 9 Oct 2023 18:15:53 +0200 Christian Brauner <brauner@kernel.org> 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 [unhandled content-type:application/pgp-signature] | |