From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chanwoo Choi <cw00.choi@samsung.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Laurentiu Palcu <laurentiu.palcu@nxp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Lucas Stach <l.stach@pengutronix.de>
Subject: [Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree
Date: Thu, 10 Sep 2020 14:18:54 +1000 [thread overview]
Message-ID: <20200910141854.1d4b1b10@canb.auug.org.au> (raw)
[-- Attachment #1.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 #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2020-09-10 4:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 4:18 Stephen Rothwell [this message]
2020-10-06 9:00 ` [Intel-gfx] linux-next: manual merge of the extcon tree with the drm-misc tree Stephen Rothwell
2020-10-06 10:58 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200910141854.1d4b1b10@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cw00.choi@samsung.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=krzk@kernel.org \
--cc=l.stach@pengutronix.de \
--cc=laurentiu.palcu@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox