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

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

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards")

from the mvebu tree and commit:

  b24cc2a18c50 ("media: smiapp: Rename as "ccs"")

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 90acea633c4e,02437abc94c9..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11664,17 -11630,17 +11665,28 @@@ M:	Oliver Neukum <oliver@neukum.org
  S:	Maintained
  F:	drivers/usb/image/microtek.*
  
 +MIKROTIK CRS3XX 98DX3236 BOARD SUPPORT
 +M:	Luka Kovacic <luka.kovacic@sartura.hr>
 +M:	Luka Perkov <luka.perkov@sartura.hr>
 +S:	Maintained
 +F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts
 +F:	arch/arm/boot/dts/armada-xp-crs305-1g-4s.dts
 +F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts
 +F:	arch/arm/boot/dts/armada-xp-crs326-24g-2s.dts
 +F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts
 +F:	arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dts
 +
+ MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
+ M:	Sakari Ailus <sakari.ailus@linux.intel.com>
+ L:	linux-media@vger.kernel.org
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
+ F:	Documentation/driver-api/media/drivers/ccs/
+ F:	drivers/media/i2c/ccs/
+ F:	drivers/media/i2c/smiapp-pll.c
+ F:	drivers/media/i2c/smiapp-pll.h
+ F:	include/uapi/linux/smiapp.h
+ 
  MIPS
  M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:	linux-mips@vger.kernel.org

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

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

[Sakari Ailus]

On Thu, Dec 03, 2020 at 11:51:37AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards")
> 
> from the mvebu tree and commit:
> 
>   b24cc2a18c50 ("media: smiapp: Rename as "ccs"")
> 
> 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.

Thanks, Stephen.

The resolution below seems good to me.

-- 
Sakari Ailus