From patchwork Wed May 12 14:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 435678 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5224788jao; Wed, 12 May 2021 14:52:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKfChxPyljNUE3mrk7Xz2JPgGLPateR4cjnANrDEWricgRi61edBlK1tdpQ8ErTwFDeBe5 X-Received: by 2002:a05:6402:154d:: with SMTP id p13mr46919344edx.371.1620856353620; Wed, 12 May 2021 14:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620856353; cv=none; d=google.com; s=arc-20160816; b=X9ehpGCbS629nY0SFUBaU3ATaOGrWy4w7zQoXNkgyAoZsReerlX1AioDjjosdNkxB+ nqOrJs4QcDxIiElFmS11RlGQ4qTa77SPsKkPipFrhuFg9zOw3hX+sqVXUOArG3jOhhih GxkbHRGDJ4/tq6DzvUIcJjCmdrUlMYrcUVCRcpflpGOHM6MKVOyiQB4WVt97deY6whrI PkylzKKR40WU7yT8Uq2MWCvta2rIRKZtuEDsQm38UpamYGFgd/0iXAbGu55O3xO0u5aP uFDbYIRSmhYefa6bcUoIfO4F1/8HGAs4aMC5TQRdP1j6h3pPie3vFIaRlT9bEtEF3aMx RlTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HcY7TrPcc+SOrFbbmNHARz9dqwzzvDNd60MdbQfdQjo=; b=TtBh7uWcWUC3XwufcSjWXicC06H3SOH258HlQgcbb95iqN4BUkHUbF/iH5s3OM059a w6Akx5ThgjRCCYXBWrG0G94tCNpANGgiozGRUP8LRjWyrBR/nEa/igZoejJai7j6zLmU wkqBD/+/tBJfJR8MsgE5BICKZV+X9DM4n79QSK5a4pb0h/rMBIErVqSfb/X9hpEIvrgY Dz0X4wsjmbflClgtgmZ6gouiR3D0V6fbwthhO91FiCaVr3PetrDO+fNs7wht7XvW5IPu h8meF8zYN0UoNsCG5wiVHibV6ZjKE+6G6QiJyBDC4jKsicWaKuwwu4V/ayDegosIFlxz uaAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gUlJKozL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u19si859013ejx.176.2021.05.12.14.52.33; Wed, 12 May 2021 14:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gUlJKozL; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345091AbhELRGE (ORCPT + 12 others); Wed, 12 May 2021 13:06:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:48156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237886AbhELQtW (ORCPT ); Wed, 12 May 2021 12:49:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 217FA61D53; Wed, 12 May 2021 16:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620836162; bh=x6IIQ3xVA6PrYrrXSvlR0k9iFErrr00WFalA7SC+nP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gUlJKozLqhQENd1pSvhXEhDdQ/qCVjswFaQLrX2TU9cyvEG9AVBoAOvqJp+LXIQh8 KkyXr9GN9U7FCDmibkz8P1HoiAWTZgykJT5JxTUh81vjp97Y5OAEbK0RdzTk1C/SBy NozItVn5poC08F2hcM9GmaafCAteHzGsXmdfZ1Pk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Vladimir Oltean , "David S. Miller" , Sasha Levin Subject: [PATCH 5.12 634/677] net: enetc: fix link error again Date: Wed, 12 May 2021 16:51:20 +0200 Message-Id: <20210512144858.427369074@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 74c97ea3b61e4ce149444f904ee8d4fc7073505b ] A link time bug that I had fixed before has come back now that another sub-module was added to the enetc driver: ERROR: modpost: "enetc_ierb_register_pf" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko] undefined! The problem is that the enetc Makefile is not actually used for the ierb module if that is the only built-in driver in there and everything else is a loadable module. Fix it by always entering the directory this time, regardless of which symbols are configured. This should reliably fix the problem and prevent it from coming back another time. Fixes: 112463ddbe82 ("net: dsa: felix: fix link error") Fixes: e7d48e5fbf30 ("net: enetc: add a mini driver for the Integrated Endpoint Register Block") Signed-off-by: Arnd Bergmann Acked-by: Vladimir Oltean Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile index 67c436400352..de7b31842233 100644 --- a/drivers/net/ethernet/freescale/Makefile +++ b/drivers/net/ethernet/freescale/Makefile @@ -24,6 +24,4 @@ obj-$(CONFIG_FSL_DPAA_ETH) += dpaa/ obj-$(CONFIG_FSL_DPAA2_ETH) += dpaa2/ -obj-$(CONFIG_FSL_ENETC) += enetc/ -obj-$(CONFIG_FSL_ENETC_MDIO) += enetc/ -obj-$(CONFIG_FSL_ENETC_VF) += enetc/ +obj-y += enetc/