* linux-next: manual merge of the char-misc tree with the drm tree
@ 2018-10-17 3:22 Stephen Rothwell
2018-10-17 5:01 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-10-17 3:22 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Dave Airlie, DRI
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Gerd Hoffmann, Dan Williams, Alexander Viro
[-- Attachment #1: Type: text/plain, Size: 1397 bytes --]
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@zeniv.linux.org.uk>
+ S: Maintained
+ F: lib/iov_iter.c
+ F: include/linux/uio.h
+
+USERSPACE DMA BUFFER DRIVER
+M: Gerd Hoffmann <kraxel@redhat.com>
+S: Maintained
+L: dri-devel@lists.freedesktop.org
+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@linuxfoundation.org>
S: Maintained
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the char-misc tree with the drm tree
2018-10-17 3:22 linux-next: manual merge of the char-misc tree with the drm tree Stephen Rothwell
@ 2018-10-17 5:01 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-10-17 5:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Dave Airlie, Linux Kernel Mailing List, DRI,
Linux-Next Mailing List, Gerd Hoffmann, Dan Williams,
Alexander Viro
On Wed, Oct 17, 2018 at 02:22:57PM +1100, Stephen Rothwell wrote:
> 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.
Looks good to me, thanks.
greg k-h
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-17 5:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-17 3:22 linux-next: manual merge of the char-misc tree with the drm tree Stephen Rothwell
2018-10-17 5:01 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).