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

2018-10-16 Thread Greg KH
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 ("MAINTAI

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

2018-10-16 Thread 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