Subject: linux-next: manual merge of the drm tree with the vfs tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Jul 2019 14:17:54 +1000

Hi all,

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

  include/uapi/linux/magic.h

between commit:

  ea8157ab2ae5 ("zsfold: Convert zsfold to use the new mount API")

from the vfs tree and commit:

  ed63bb1d1f84 ("dma-buf: give each buffer a full-fledged inode")

from the drm 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 include/uapi/linux/magic.h
index 85c1119d0b0b,665e18627f78..000000000000
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@@ -91,6 -91,6 +91,7 @@@
  #define UDF_SUPER_MAGIC		0x15013346
  #define BALLOON_KVM_MAGIC	0x13661366
  #define ZSMALLOC_MAGIC		0x58295829
 +#define Z3FOLD_MAGIC		0x33
+ #define DMA_BUF_MAGIC		0x444d4142	/* "DMAB" */
  
  #endif /* __LINUX_MAGIC_H__ */