linux-next: manual merge of the iio tree with the v4l-dvb tree

linux-next: manual merge of the iio tree with the v4l-dvb tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1822 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  MAINTAINERS

between commit:

  644428ae65c1a ("dt-bindings: media: i2c: Add Mira016 image sensor")

from the v4l-dvb tree and commit:

  bdb0e2d5271b5 ("dt-bindings: iio: light: add as7343")

from the iio 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.

diff --cc MAINTAINERS
index 8b93281252d75,0017755f593bc..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1511,22 -1490,13 +1511,29 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/iio/light/ams,as73211.yaml
  F:	drivers/iio/light/as73211.c
  
+ AMS AS7343 DRIVER
+ M:	Chang Yu <marcus.yu.56@gmail.com>
+ L:	linux-iio@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/iio/light/ams,as7343.yaml
+ F:	drivers/iio/light/as7343.c
+ 
 +AMS MIRA016 DRIVER
 +M:	Jacopo Mondi <jacopo.mondi@ideasonboard.com>
 +M:	Philippe Baetens <philippebaetens@gmail.com>
 +L:	linux-media@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/media/i2c/ams,mira016.yaml
 +F:	drivers/media/i2c/mira016.c
 +
 +AMS MIRA220 DRIVER
 +M:	Jacopo Mondi <jacopo.mondi@ideasonboard.com>
 +M:	Philippe Baetens <philippebaetens@gmail.com>
 +L:	linux-media@vger.kernel.org
 +S:	Maintained
 +F:	Documentation/devicetree/bindings/media/i2c/ams,mira220.yaml
 +F:	drivers/media/i2c/mira220.c
 +
  AMT (Automatic Multicast Tunneling)
  M:	Taehee Yoo <ap420073@gmail.com>
  L:	netdev@vger.kernel.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]