* linux-next: manual merge of the v4l-dvb tree with the hwmon-staging tree
@ 2021-03-22 23:52 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-03-22 23:52 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Guenter Roeck
Cc: Hans Verkuil, Jonas Malaco, Linux Kernel Mailing List,
Linux Next Mailing List, Mauro Carvalho Chehab, Mirela Rabulea
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
Hi all,
Today's linux-next merge of the v4l-dvb tree got a conflict in:
MAINTAINERS
between commit:
38f15506d965 ("hwmon: add driver for NZXT Kraken X42/X52/X62/X72")
from the hwmon-staging tree and commit:
be157db0a3d8 ("media: Add maintainer for IMX jpeg v4l2 driver")
from the v4l-dvb 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 dda782e9e578,04e6df934eb0..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12941,13 -12910,14 +12941,21 @@@ L: linux-nfc@lists•01.org (moderated fo
S: Supported
F: drivers/nfc/nxp-nci
+ NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+ M: Mirela Rabulea <mirela.rabulea@nxp•com>
+ R: NXP Linux Team <linux-imx@nxp•com>
+ L: linux-media@vger•kernel.org
+ S: Maintained
+ F: Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F: drivers/media/platform/imx-jpeg
+
+NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
+M: Jonas Malaco <jonas@protocubo•io>
+L: linux-hwmon@vger•kernel.org
+S: Maintained
+F: Documentation/hwmon/nzxt-kraken2.rst
+F: drivers/hwmon/nzxt-kraken2.c
+
OBJAGG
M: Jiri Pirko <jiri@nvidia•com>
L: netdev@vger•kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-22 23:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-22 23:52 linux-next: manual merge of the v4l-dvb tree with the hwmon-staging tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox