Re: linux-next: manual merge of the gpio-brgl tree with Linus' tree and the jc_docs tree

[Stephen Rothwell]

Hi all,

On Fri, 18 Jul 2025 19:05:51 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   edb471108cf1 ("MAINTAINERS: remove bouncing address for Nandor Han")
> 
> from Linus' tree, commit:
> 
>   739ca710a777 ("MAINTAINERS: replace git protocol for github")
> 
> from the jc_docs tree and commits:
> 
>   ae455b249449 ("dt-bindings: gpio: Convert qca,ar7100-gpio to DT schema")
>   f03a7f20b23c ("dt-bindings: gpio: Create a trivial GPIO schema")
> 
> from the gpio-brgl 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 caf590460070,971ee194ee83..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -3871,8 -3814,8 +3870,8 @@@ ATHEROS 71XX/9XXX GPIO DRIVE
>   M:	Alban Bedel <albeu@xxxxxxx>
>   S:	Maintained
>   W:	https://github.com/AlbanBedel/linux
>  -T:	git git://github.com/AlbanBedel/linux
>  +T:	git https://github.com/AlbanBedel/linux.git
> - F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt
> + F:	Documentation/devicetree/bindings/gpio/qca,ar7100-gpio.yaml
>   F:	drivers/gpio/gpio-ath79.c
>   
>   ATHEROS 71XX/9XXX USB PHY DRIVER

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

-- 
Cheers,
Stephen Rothwell

Attachment: pgpz_mQ5F_rk1.pgp
Description: OpenPGP digital signature