* linux-next: manual merge of the extcon tree with the drm-misc tree
@ 2020-09-10 4:18 Stephen Rothwell
2020-10-06 9:00 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-09-10 4:18 UTC (permalink / raw)
To: Chanwoo Choi, Daniel Vetter, Intel Graphics, DRI
Cc: Laurentiu Palcu, Lucas Stach, Krzysztof Kozlowski,
Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]
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.
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 <laurentiu.palcu@oss.nxp.com>
+R: Lucas Stach <l.stach@pengutronix.de>
+L: dri-devel@lists.freedesktop.org
+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 <krzk@kernel.org>
+ L: linux-kernel@vger.kernel.org
+ S: Maintained
+ F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
+ F: drivers/extcon/extcon-ptn5150.c
+
NXP SGTL5000 DRIVER
M: Fabio Estevam <festevam@gmail.com>
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the extcon tree with the drm-misc tree
2020-09-10 4:18 linux-next: manual merge of the extcon tree with the drm-misc tree Stephen Rothwell
@ 2020-10-06 9:00 ` Stephen Rothwell
2020-10-06 10:58 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-10-06 9:00 UTC (permalink / raw)
To: Dave Airlie, Greg KH, Arnd Bergmann
Cc: Chanwoo Choi, Daniel Vetter, Intel Graphics, DRI,
Laurentiu Palcu, Lucas Stach, Krzysztof Kozlowski,
Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 1955 bytes --]
Hi all,
On Thu, 10 Sep 2020 14:18:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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 <laurentiu.palcu@oss.nxp.com>
> +R: Lucas Stach <l.stach@pengutronix.de>
> +L: dri-devel@lists.freedesktop.org
> +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 <krzk@kernel.org>
> + L: linux-kernel@vger.kernel.org
> + S: Maintained
> + F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
> + F: drivers/extcon/extcon-ptn5150.c
> +
> NXP SGTL5000 DRIVER
> M: Fabio Estevam <festevam@gmail.com>
> L: alsa-devel@alsa-project.org (moderated for non-subscribers)
This is now a conflict between the char-misc tree and the drm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the extcon tree with the drm-misc tree
2020-10-06 9:00 ` Stephen Rothwell
@ 2020-10-06 10:58 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2020-10-06 10:58 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Arnd Bergmann, Chanwoo Choi, Daniel Vetter,
Intel Graphics, DRI, Laurentiu Palcu, Lucas Stach,
Krzysztof Kozlowski, Linux Next Mailing List,
Linux Kernel Mailing List
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 <sfr@canb.auug.org.au> 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 <laurentiu.palcu@oss.nxp.com>
> > +R: Lucas Stach <l.stach@pengutronix.de>
> > +L: dri-devel@lists.freedesktop.org
> > +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 <krzk@kernel.org>
> > + L: linux-kernel@vger.kernel.org
> > + S: Maintained
> > + F: Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml
> > + F: drivers/extcon/extcon-ptn5150.c
> > +
> > NXP SGTL5000 DRIVER
> > M: Fabio Estevam <festevam@gmail.com>
> > L: alsa-devel@alsa-project.org (moderated for non-subscribers)
>
> This is now a conflict between the char-misc tree and the drm tree.
Looks fine, this should be easy for Linus to resolve :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-06 10:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 4:18 linux-next: manual merge of the extcon tree with the drm-misc tree Stephen Rothwell
2020-10-06 9:00 ` Stephen Rothwell
2020-10-06 10:58 ` 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).