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

[Stephen Rothwell]

Hi all,

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

  MAINTAINERS

between commit:

  fbb0de795078 ("Add udmabuf misc device")

from the drm tree and commit:

  9793c1fd1775 ("MAINTAINERS: Clarify UIO vs UIOVEC maintainer")

from the char-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 MAINTAINERS
index 7d70a6c5eeee,a38c13c7da9a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15594,14 -15365,12 +15595,20 @@@ F:	arch/x86/um
  F:	fs/hostfs/
  F:	fs/hppfs/
  
+ USERSPACE COPYIN/COPYOUT (UIOVEC)
+ M:	Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
+ S:	Maintained
+ F:	lib/iov_iter.c
+ F:	include/linux/uio.h
+ 
 +USERSPACE DMA BUFFER DRIVER
 +M:	Gerd Hoffmann <kraxel@xxxxxxxxxx>
 +S:	Maintained
 +L:	dri-devel@xxxxxxxxxxxxxxxxxxxxx
 +F:	drivers/dma-buf/udmabuf.c
 +F:	include/uapi/linux/udmabuf.h
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
 +
  USERSPACE I/O (UIO)
  M:	Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
  S:	Maintained

Attachment: pgpONH344YTxa.pgp
Description: OpenPGP digital signature