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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250730091159.6bdf168c@canb.auug.org.au>
Date: Wed, 30 Jul 2025 09:11:59 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kishon Vijay Abraham I <kishon@...nel.org>, Vinod Koul
 <vkoul@...nel.org>, Jonathan Corbet <corbet@....net>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, "Rob Herring (Arm)"
 <robh@...nel.org>, Xose Vazquez Perez <xose.vazquez@...il.com>
Subject: Re: linux-next: manual merge of the phy-next tree with the jc_docs
 tree

Hi all,

On Wed, 2 Jul 2025 15:38:36 +1000 Stephen Rothwell <sfr@...b.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@...e.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

Content of type "application/pgp-signature" skipped