From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11C33339866; Thu, 28 May 2026 20:04:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779998679; cv=none; b=Oafhe4Ep1P83uZ3Lgvvxi+aPtZ0vg4y+mFuHch1tTXp4TdzvfmBehL5lvEHQc/8q2eBkEzXxNSuXfmz9+VpppclkWsRSSyaJgeMZBTm3KL3j6SipCQ++ac8VDQFbeHkCJB1lozQVniDRAV/LcrQOm45Syxtqppf8Wxc9p1LhsaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779998679; c=relaxed/simple; bh=wvzVzBiNNc7pSSiktZyRp3DeDJsrIozwR7fOSJytmMw=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s5WwBQtTPbDlX63vwePExr5z1NjdbdvzrwLwAF7aMHbYQuytIjFfCFHJ785sOv1ISDS0x0frr4wi1t927oqA1OUisJtqdOQ8iCDs9c9O98RbSIpI4m+AWg92AYaYIsAtCSVD+KYv7BoWg9n0nBUDRTmv2btAX7jXYkPNtLvjg94= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QxqrKBO3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QxqrKBO3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A9321F00A3A; Thu, 28 May 2026 20:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779998677; bh=WVjZ77WKanlIoER/YuUvLPXIh6A2toQ/kFAdLdwWH6g=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=QxqrKBO33zRwgngfe8npfS0gioZ/JnMOqrQXJ9uTbSeOiWR0B7dfSKyNf6utog185 U+a4fjR18dzGBLffCbtljBwGoaM4XPEI2rb8r16jyV39pNEC9aVSBkiTePpo8bcJWt CAoVXWuNiSNo3ayxqYFIjs5T5uAlz5WU+ovW4pY7XRr0rXWkeSpAIcEtsTs6lMt/Iz 2iOYSWlyLEQNscHrctet8rTA7Xd4K9cBACAbXNGkpl9K/Kj/qeMlED2tzOanbcGzL9 XCzXRiOp2/OKqYsAwksQx8c258b8CXvGHCdxVmMHpEuvC1jvBJZ4xe7ZtUN0pDcGMC Wyiv24TDeqW3g== Date: Thu, 28 May 2026 13:04:36 -0700 From: Jakub Kicinski To: Louis-Alexis Eyraud , Lucien Jheng Cc: Mark Brown , David Miller , Paolo Abeni , Networking , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20260528130436.450720f9@kernel.org> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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.