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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
