[PATCH v2 phy-next 22/24] phy: include PHY provider header (2/2)

Vladimir Oltean vladimir.oltean at nxp.com
Sun Mar 8 05:37:25 PDT 2026


On Sun, Mar 08, 2026 at 12:01:36PM +0000, Russell King (Oracle) wrote:
> On Sun, Mar 08, 2026 at 01:40:07PM +0200, vladimir.oltean at nxp.com wrote:
> > diff --git a/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c b/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c
> > index 5b1c82459c12..4f8ffc6524ab 100644
> > --- a/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c
> > +++ b/drivers/phy/qualcomm/phy-qcom-sgmii-eth.c
> > @@ -7,10 +7,11 @@
> >  #include <linux/ethtool.h>
> >  #include <linux/module.h>
> >  #include <linux/of.h>
> > -#include <linux/phy/phy.h>
> >  #include <linux/platform_device.h>
> >  #include <linux/regmap.h>
> >  
> > +#include "../phy-provider.h"
> > +
> 
> As we know, this will conflict with my patch in net-next. I guess Vinod
> hasn't (yet?) merged the commit that Jakub provided.

Right (https://lore.kernel.org/netdev/20260302155736.1fd2980e@kernel.org/).

My thinking is that linux-phy needs to provide this series as a tag
itself for other trees, so it needs to be applied apply on top of
v7.0-rc1 plus Jakub's tag.

But to get some (public) build testing, I based it onto current
linux-phy/next. I believe the adjustments can be made during patch
application. Jakub's tag can be pulled on demand when constructing the
linux-phy tag.



More information about the Linux-rockchip mailing list