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

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZpTBCUXx5e24izzR@matsya>
Date: Mon, 15 Jul 2024 11:56:17 +0530
From: Vinod Koul <vkoul@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Kishon Vijay Abraham I <kishon@...nel.org>,
	David Miller <davem@...emloft.net>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Lorenzo Bianconi <lorenzo@...nel.org>
Subject: Re: linux-next: manual merge of the phy-next tree with the net-next
 tree

Hi Stephen,

On 15-07-24, 15:12, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the phy-next tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC")
> 
> from the net-next tree and commit:
> 
>   d7d2818b9383 ("phy: airoha: Add PCIe PHY driver for EN7581 SoC.")
> 
> from the phy-next tree.

lgtm, thanks for letting us know

> 
> 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 d739d07fb234,269c2144bedb..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -693,15 -682,14 +693,23 @@@ S:	Supporte
>   F:	fs/aio.c
>   F:	include/linux/*aio*.h
>   
>  +AIROHA ETHERNET DRIVER
>  +M:	Lorenzo Bianconi <lorenzo@...nel.org>
>  +L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
>  +L:	linux-mediatek@...ts.infradead.org (moderated for non-subscribers)
>  +L:	netdev@...r.kernel.org
>  +S:	Maintained
>  +F:	Documentation/devicetree/bindings/net/airoha,en7581-eth.yaml
>  +F:	drivers/net/ethernet/mediatek/airoha_eth.c
>  +
> + AIROHA PCIE PHY DRIVER
> + M:	Lorenzo Bianconi <lorenzo@...nel.org>
> + L:	linux-arm-kernel@...ts.infradead.org (moderated for non-subscribers)
> + S:	Maintained
> + F:	Documentation/devicetree/bindings/phy/airoha,en7581-pcie-phy.yaml
> + F:	drivers/phy/phy-airoha-pcie-regs.h
> + F:	drivers/phy/phy-airoha-pcie.c
> + 
>   AIROHA SPI SNFI DRIVER
>   M:	Lorenzo Bianconi <lorenzo@...nel.org>
>   M:	Ray Liu <ray.liu@...oha.com>



-- 
~Vinod