linux-next: manual merge of the phy-next tree with the jc_docs tree

Posted by Stephen Rothwell 3 months, 1 week ago

Hi all,

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

  MAINTAINERS

between commit:

  739ca710a777 ("MAINTAINERS: replace git protocol for github")

from the jc_docs tree and commit:

  3ed7be12756d ("dt-bindings: phy: Convert qca,ar7100-usb-phy to DT schema")

from the phy-next 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 ea884d4e18f3,04cda64989c5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3833,8 -3822,8 +3833,8 @@@ ATHEROS 71XX/9XXX USB PHY DRIVE
  M:	Alban Bedel <albeu@free.fr>
  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/phy/phy-ath79-usb.txt
+ F:	Documentation/devicetree/bindings/phy/qca,ar7100-usb-phy.yaml
  F:	drivers/phy/qualcomm/phy-ath79-usb.c
  
  ATHEROS ATH GENERIC UTILITIES

Re: linux-next: manual merge of the phy-next tree with the jc_docs tree

Posted by Stephen Rothwell 2 months, 1 week ago

Hi all,

On Wed, 2 Jul 2025 15:38:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   739ca710a777 ("MAINTAINERS: replace git protocol for github")
> 
> from the jc_docs tree and commit:
> 
>   3ed7be12756d ("dt-bindings: phy: Convert qca,ar7100-usb-phy to DT schema")
> 
> from the phy-next 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 ea884d4e18f3,04cda64989c5..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -3833,8 -3822,8 +3833,8 @@@ ATHEROS 71XX/9XXX USB PHY DRIVE
>   M:	Alban Bedel <albeu@free.fr>
>   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/phy/phy-ath79-usb.txt
> + F:	Documentation/devicetree/bindings/phy/qca,ar7100-usb-phy.yaml
>   F:	drivers/phy/qualcomm/phy-ath79-usb.c
>   
>   ATHEROS ATH GENERIC UTILITIES

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

-- 
Cheers,
Stephen Rothwell