linux-next: manual merge of the vfs tree with the zonefs tree

[Stephen Rothwell]

Hi all,

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

  fs/Makefile

between commit:

  ce8e2158ce5d ("fs: New zonefs file system")

from the zonefs tree and commit:

  c0111e5be2e5 ("fs: Add VirtualBox guest shared folder (vboxsf) support")

from the vfs tree.

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/Makefile
index 527f228a5e8a,b807cbff3790..000000000000
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -133,4 -133,4 +133,5 @@@ obj-$(CONFIG_CEPH_FS)		+= ceph
  obj-$(CONFIG_PSTORE)		+= pstore/
  obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
  obj-$(CONFIG_EROFS_FS)		+= erofs/
+ obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
 +obj-$(CONFIG_ZONEFS_FS)		+= zonefs/

Attachment: pgpv1NeKwRRnv.pgp
Description: OpenPGP digital signature