linux-next: manual merge of the drm-misc tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  include/uapi/linux/dma-buf.h

between commit:

  7c3e9fcad9c7 ("dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace")

from Linus' tree and commits:

  20e10881a043 ("dma-buf: Add an API for exporting sync files (v14)")
  594740497e99 ("dma-buf: Add an API for importing sync files (v10)")

from the drm-misc 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/dma-buf.h
index b1523cb8ab30,30fb8834aa3c..000000000000
--- a/include/uapi/linux/dma-buf.h
+++ b/include/uapi/linux/dma-buf.h
@@@ -92,7 -174,9 +174,9 @@@ struct dma_buf_import_sync_file 
   * between them in actual uapi, they're just different numbers.
   */
  #define DMA_BUF_SET_NAME	_IOW(DMA_BUF_BASE, 1, const char *)
 -#define DMA_BUF_SET_NAME_A	_IOW(DMA_BUF_BASE, 1, u32)
 -#define DMA_BUF_SET_NAME_B	_IOW(DMA_BUF_BASE, 1, u64)
 +#define DMA_BUF_SET_NAME_A	_IOW(DMA_BUF_BASE, 1, __u32)
 +#define DMA_BUF_SET_NAME_B	_IOW(DMA_BUF_BASE, 1, __u64)
+ #define DMA_BUF_IOCTL_EXPORT_SYNC_FILE	_IOWR(DMA_BUF_BASE, 2, struct dma_buf_export_sync_file)
+ #define DMA_BUF_IOCTL_IMPORT_SYNC_FILE	_IOW(DMA_BUF_BASE, 3, struct dma_buf_import_sync_file)
  
  #endif

Attachment: pgps_noT8Oja4.pgp
Description: OpenPGP digital signature