On Thu, 22 Feb 2024 16:01:25 -0800 Jakub Kicinski wrote: > On Thu, 22 Feb 2024 13:56:45 -0800 Florian Fainelli wrote: > > > + if (intf->internal_phy) > > > + dev->phydev->irq = PHY_MAC_INTERRUPT; > > > > There will be a trivial conflict here due to > > 5b76d928f8b779a1b19c5842e7cabee4cbb610c3 ("net: bcmasp: Indicate MAC is > > in charge of PHY PM") > > FWIW the trees have now converged so the series no longer applies. > Please rebase & resend. To be clear - after you waited the 24h. No special dispensation :S