From patchwork Wed May 12 14:50:39 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: 435617 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5071082jao; Wed, 12 May 2021 11:19:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzyak7XKsPNpzMRFzb0gY6rUWU7leVxqj67EnO8QrFhYpgpOvIJOmb7xkQ2TTtwZpR/1Tm1 X-Received: by 2002:a05:6e02:10c5:: with SMTP id s5mr33974967ilj.88.1620843573715; Wed, 12 May 2021 11:19:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843573; cv=none; d=google.com; s=arc-20160816; b=I7YfA4VwVeGAOAV+AV7aRGzdsTcM+a49kLPTrgf6hu1yVq+bmWFz3gvaDqJTaB8agd E+lYyAjjz+3WU+5X2yVC9xSmqYYZoKNcxeZpQo4iuFC0youQJIVo8acnd179QNLukKRa i1wb5+K1I+5gSsf9EV4XCAtIXY9mylLPT3f+JyAAVn+e7fKXxN416nri4itk4N94PI4o /djrkd6ne6VKTg57B6jWBc1RRdn51RUOqCd/rJKkNgEkBBHooQM3OZwrBRAN6q0ytad2 7p5K+154wycc8EvcfN7Mt+LZkd2F0NM7qCwuMXgl7hLF4uIjALfvFF8Ggtx4XM5inuZG 6hww== 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=y2a0+0+sjdzM/aNsP0fjiLawBl19QQ+6pCskgJrq03d4ucuQkgqqHBkcJ0cTENHGJa w9utegVGLoYuHyRjezUUYwHsZHwMU+0IUQ2ttvBSIVaR+xG9S/exlnZGEhgIOeiW6L0r w1cKUvABJ825ss5ANU12w7n6DTKyH0P7LD7XtS7oIHOQh+hsqDtSsVO/eZQRT9nv+vH2 QrPHcGZhVlGdJu3crEodpalq0IWw97ImttGyR1lCwynZd0vOEEzQEcpL2GrOGYXq4VLN E3Yed9jpxWfHJ+A7Wv2nc3hww+1W41o4oC7w24lox3Ep/glTY2Zm6T5uLdAfF8PuhZls /Vwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zt+ihVBY; 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 q8si330223ior.12.2021.05.12.11.19.33; Wed, 12 May 2021 11:19: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=zt+ihVBY; 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 S234454AbhELQcG (ORCPT + 12 others); Wed, 12 May 2021 12:32:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:44832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241114AbhELQ0Y (ORCPT ); Wed, 12 May 2021 12:26:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B867E619C3; Wed, 12 May 2021 15:49:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834571; bh=x6IIQ3xVA6PrYrrXSvlR0k9iFErrr00WFalA7SC+nP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zt+ihVBYSVEfPDaXKgQdbl5eml7xHWiCssWriv37nh6rQ/b3TXju6hhoSYP4Q3ueB y1sqnxa0zQktv69TfS/wSQuhRSflgtYyMIh1DTxYCc7e6+jyWPJRpd+1W6nLcEnDyt Rs4f0/QAUN4aP97EJ5Y13zk1nw5gbwudzaUvkYjw= 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.11 562/601] net: enetc: fix link error again Date: Wed, 12 May 2021 16:50:39 +0200 Message-Id: <20210512144846.357924633@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@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/