Subject: linux-next: manual merge of the v4l-dvb tree with the hwmon-staging tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 23 Mar 2021 10:52:51 +1100

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:	[email-masked] (moderated fo
  S:	Supported
  F:	drivers/nfc/nxp-nci
  
+ NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+ M:	Mirela Rabulea <[email-masked]>
+ R:	NXP Linux Team <[email-masked]>
+ L:	[email-masked]
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F:	drivers/media/platform/imx-jpeg
+ 
 +NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
 +M:	Jonas Malaco <[email-masked]>
 +L:	[email-masked]
 +S:	Maintained
 +F:	Documentation/hwmon/nzxt-kraken2.rst
 +F:	drivers/hwmon/nzxt-kraken2.c
 +
  OBJAGG
  M:	Jiri Pirko <[email-masked]>
  L:	[email-masked]