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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/erofs/super.c

between commits:

  ab1bbc1735ff ("erofs: get rid of erofs_fs_context")
  569a48fed355 ("erofs: reliably distinguish block based and fscache mode")

from the erofs-fixes tree and commit:

  e4f586a41748 ("erofs: reliably distinguish block based and fscache mode")

from the vfs-brauner tree.

I fixed it up (I think - I used the former version) 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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp6y2bC6Qtiw.pgp
Description: OpenPGP digital signature