From patchwork Mon Jan 11 02:46:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 565587 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5E944140311 for ; Mon, 11 Jan 2016 13:46:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758034AbcAKCqS (ORCPT ); Sun, 10 Jan 2016 21:46:18 -0500 Received: from ozlabs.org ([103.22.144.67]:38559 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758006AbcAKCqR (ORCPT ); Sun, 10 Jan 2016 21:46:17 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 80937140311; Mon, 11 Jan 2016 13:46:15 +1100 (AEDT) Date: Mon, 11 Jan 2016 13:46:15 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Lunn , Roosen Henri Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20160111134615.60c08c54@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the net-next tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/net/phy/micrel.c: In function 'ksz9031_config_init': drivers/net/phy/micrel.c:492:22: error: 'struct phy_device' has no member named 'dev' dev_walker = &phydev->dev; ^ Caused by commit e5a03bfd873c ("phy: Add an mdio_device structure") interacting with commit b4c19f71252e ("phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.") from the net tree. I applied the following merge fix patch: From: Stephen Rothwell Date: Mon, 11 Jan 2016 13:25:09 +1100 Subject: [PATCH] phy: micrel: fix up for "phy: Add an mdio_device structure" Signed-off-by: Stephen Rothwell --- drivers/net/phy/micrel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 41b598548f2e..03833dbfca67 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -489,7 +489,7 @@ static int ksz9031_config_init(struct phy_device *phydev) * properties in the MAC node. Walk up the tree of devices to * find a device with an OF node. */ - dev_walker = &phydev->dev; + dev_walker = &phydev->mdio.dev; do { of_node = dev_walker->of_node; dev_walker = dev_walker->parent;