Re: linux-next: manual merge of the spi tree with the i2c tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

On Thu, 16 Feb 2023 11:30:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the spi tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   b3de755d6041 ("dt-bindings: i2c: i2c-st: convert to DT schema")
> 
> from the i2c tree and commit:
> 
>   7ec844a2c753 ("spi: spi-st-ssc: convert to DT schema")
> 
> from the spi 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 71e92d3c51c6,daa33e7bb457..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2791,7 -2925,8 +2791,8 @@@ M:	Patrice Chotard <patrice.chotard@fos
>   L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>   S:	Maintained
>   W:	http://www.stlinux.com
> + F:	Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
>  -F:	Documentation/devicetree/bindings/i2c/i2c-st.txt
>  +F:	Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
>   F:	arch/arm/boot/dts/sti*
>   F:	arch/arm/mach-sti/
>   F:	drivers/ata/ahci_st.c

This is now a conflict between the i2c tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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