From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4C98C4741F for ; Mon, 28 Sep 2020 12:37:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79C742158C for ; Mon, 28 Sep 2020 12:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726638AbgI1Mho (ORCPT ); Mon, 28 Sep 2020 08:37:44 -0400 Received: from vps0.lunn.ch ([185.16.172.187]:59340 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726281AbgI1Mho (ORCPT ); Mon, 28 Sep 2020 08:37:44 -0400 Received: from andrew by vps0.lunn.ch with local (Exim 4.94) (envelope-from ) id 1kMsPK-00GXDC-Tw; Mon, 28 Sep 2020 14:37:30 +0200 Date: Mon, 28 Sep 2020 14:37:30 +0200 From: Andrew Lunn To: Stephen Rothwell Cc: David Miller , Networking , Randy Dunlap , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20200928123730.GA3940833@lunn.ch> References: <20200928124608.2f527504@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200928124608.2f527504@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org > From: Stephen Rothwell > Date: Mon, 28 Sep 2020 12:42:10 +1000 > Subject: [PATCH] merge fix for "mdio: fix mdio-thunder.c dependency & build error" > > Signed-off-by: Stephen Rothwell > --- > drivers/net/mdio/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/mdio/Kconfig b/drivers/net/mdio/Kconfig > index 840727cc9499..27a2a4a3d943 100644 > --- a/drivers/net/mdio/Kconfig > +++ b/drivers/net/mdio/Kconfig > @@ -164,6 +164,7 @@ config MDIO_THUNDER > depends on 64BIT > depends on PCI > select MDIO_CAVIUM > + select MDIO_DEVRES > help > This driver supports the MDIO interfaces found on Cavium > ThunderX SoCs when the MDIO bus device appears as a PCI > -- > 2.28.0 Reviewed-by: Andrew Lunn Andrew