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

[Jakub Kicinski]

On Thu, 28 May 2026 16:55:28 +0100 Mark Brown wrote:
> 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 drivers/net/phy/air_en8811h.c
> index a86129ce693c2,a42898ae41358..0000000000000
> --- a/drivers/net/phy/air_en8811h.c
> +++ b/drivers/net/phy/air_en8811h.c
> @@@ -260,218 -229,6 +245,31 @@@ static const unsigned long en8811h_led_
>   					      BIT(TRIGGER_NETDEV_RX)          |
>   					      BIT(TRIGGER_NETDEV_TX);
>   
> - static int air_phy_read_page(struct phy_device *phydev)
> - {
> - 	return __phy_read(phydev, AIR_EXT_PAGE_ACCESS);
> - }
> - 
> - static int air_phy_write_page(struct phy_device *phydev, int page)
> - {
> - 	return __phy_write(phydev, AIR_EXT_PAGE_ACCESS, page);
> - }
> - 
>  +static int __air_pbus_reg_write(struct mdio_device *mdiodev,
>  +				u32 pbus_reg, u32 pbus_data)
>  +{
>  +	int ret;
>  +
>  +	ret = __mdiobus_write(mdiodev->bus, mdiodev->addr, AIR_EXT_PAGE_ACCESS,
>  +			      upper_16_bits(pbus_reg));
>  +	if (ret < 0)
>  +		return ret;

Unclear to me why this is using __mdiobus_write() instead of __phy_write
when the callers have access to the phydev..

Our PR to Linus is now out, hopefully he pulls soon.
The AIR_EXT_PAGE_ACCESS define is no longer visible in air_en8811h.c

Louis, I'm going to move the define to the header to keep the merge
simple. Could you follow up with a cleanup once Linus pulls and I push
out the merge? Or if you prefer another resolution just show me a diff.
If I get it before Linus pulls I'll use it.