Hi all, On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell <[email protected]> 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: > > d0e3c25150dd ("MAINTAINERS: Add entry for NXP PTN5150A CC driver") > > from the extcon 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 623c53ab5bd5,da94c9b12f1b..000000000000 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@@ -12496,14 -12430,13 +12496,21 @@@ F: > drivers/iio/gyro/fxas21002c_core. > F: drivers/iio/gyro/fxas21002c_i2c.c > F: drivers/iio/gyro/fxas21002c_spi.c > > +NXP i.MX 8MQ DCSS DRIVER > +M: Laurentiu Palcu <[email protected]> > +R: Lucas Stach <[email protected]> > +L: [email protected] > +S: Maintained > +F: Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml > +F: drivers/gpu/drm/imx/dcss/ > + > + NXP PTN5150A CC LOGIC AND EXTCON DRIVER > + M: Krzysztof Kozlowski <[email protected]> > + L: [email protected] > + S: Maintained > + F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml > + F: drivers/extcon/extcon-ptn5150.c > + > NXP SGTL5000 DRIVER > M: Fabio Estevam <[email protected]> > L: [email protected] (moderated for non-subscribers)
This is now a conflict between the char-misc tree and the drm tree. -- Cheers, Stephen Rothwell
pgpX07bOgy9Sp.pgp
Description: OpenPGP digital signature
