Re: [Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree

2020-10-06 Thread Greg KH
On Tue, Oct 06, 2020 at 08:00:03PM +1100, Stephen Rothwell wrote: > Hi all, > > On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the extcon tree got a conflict in: > > > > MAINTAINERS > > > > between commit: > > > > f61249dddecc ("MAINTAINER

Re: [Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree

2020-10-06 Thread Stephen Rothwell
Hi all, On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the extcon tree got a conflict in: > > MAINTAINERS > > between commit: > > f61249dddecc ("MAINTAINERS: Add entry for i.MX 8MQ DCSS driver") > > from the drm-misc tree and commit: > > d0e

[Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree

2020-09-09 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the extcon tree got a conflict in: MAINTAINERS between commit: f61249dddecc ("MAINTAINERS: Add entry for i.MX 8MQ DCSS driver") from the drm-misc tree and commit: d0e3c25150dd ("MAINTAINERS: Add entry for NXP PTN5150A CC driver") from the extcon tree