Re: linux-next: manual merge of the vfs tree with the vfs-brauner tree

[Mark Brown]

On Wed, Apr 08, 2026 at 06:16:39PM +0100, Al Viro wrote:
> On Wed, Apr 08, 2026 at 01:43:50PM +0100, Mark Brown wrote:

> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.

> FWIW, I suspect that it might be a good policy to put notes on likely
> -next conflicts and their suggested resolution in the head commits of
> #for-next branches.  What I'd done yesterday was

Ah, I'll try to remember to look for those, thanks!  It's helpful to
have some ideas for what to do.  People often drop me emails about this
stuff as well if that's easier for people.

Attachment: signature.asc
Description: PGP signature