linux-next: manual merge of the nvmem tree with the iio tree

[Mark Brown]

Hi all,

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

  MAINTAINERS

between commit:

  348ff65577603 ("dt-bindings: iio: adc: mediatek,mt6359-auxadc: add mt6323 PMIC AUXADC")

from the iio tree and commit:

  b3c090960d869 ("nvmem: add mt6323 PMIC EFUSE driver")

from the nvmem 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 d8c06178fe7c1,36f7ee6ba3194..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16588,13 -16560,11 +16593,18 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/mmc/mtk-sd.yaml
  F:	drivers/mmc/host/mtk-sd.c
  
 +MEDIATEK MT6323 PMIC AUXADC DRIVER
 +M:	Roman Vivchar <rva333@xxxxxxxxxxxxxx>
 +L:	linux-iio@xxxxxxxxxxxxxxx
 +S:	Maintained
 +F:	drivers/iio/adc/mt6323-auxadc.c
 +F:	include/dt-bindings/iio/adc/mediatek,mt6323-auxadc.h
 +
+ MEDIATEK MT6323 PMIC NVMEM DRIVER
+ M:	Roman Vivchar <rva333@xxxxxxxxxxxxxx>
+ S:	Maintained
+ F:	drivers/nvmem/mt6323-efuse.c
+ 
  MEDIATEK MT6735 CLOCK & RESET DRIVERS
  M:	Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
  L:	linux-clk@xxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature