[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <ZpU9eOsMq_ogA7Nr@lore-desk>
Date: Mon, 15 Jul 2024 17:17:12 +0200
From: Lorenzo Bianconi <lorenzo@...nel.org>
To: Vinod Koul <vkoul@...nel.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
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>
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
Hi Stephen,
LGTM as well. I forgot to mention this conflict, sorry for that.
Regards,
Lorenzo
>
> >
> > 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
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists