From patchwork Wed May 12 14:50:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 435580 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp4971148jao; Wed, 12 May 2021 09:11:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBvw84v+LeMVj1XT1oyug0CpYNUfHptMGxXICiQ/6Kw6N8/+Y2IIBzxlRE9N8N79nS4KiO X-Received: by 2002:a05:6638:13cc:: with SMTP id i12mr33525931jaj.20.1620835863452; Wed, 12 May 2021 09:11:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620835863; cv=none; d=google.com; s=arc-20160816; b=yK0/q0Wm1OKZjAIX5WaEk8RS/neaG0WmIVius8vZfvCKLIV2Rhka+o4mBaMoc3EYwJ zD8uvfD1JvHEmFlR49oxEpmiApIAPwPbbM47t+Yin1GZF4r19NlSPwnu/YHI/ob/KzTL uSGpYDrG937Vcqo4cugfblBbVDb7N11mutIKMsHMDnROZyOPGaLs5hOo5aiealD6n+MT FBoUVPyKevZHq8FSrlm70ZSnMWSROup8c4gOMFHPxIS8NZLNUSwYFiQP1cyfgtbY6u9z keVWhcGVom8ubjiiZ3UNF7jzLFZO3YQBuTSZGuBIK35l8OclpiL6Kpq4jXlIvlrjayAq rLEg== 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=mT7b+MmNfrakjpi27DoknAYUKUP6b3GFm4UCQn8I3EFWR3WXj5QWuqTa9lMKO0/ao9 wMGUoS4YmdyytNcrT0jzs/lSmJhDy8+Iy/tOO7+AMzoLHp1dFKlt4jJdvaBNKvTin2zJ ms43X4QXALGrzz8/7Ilg+raSpbQtBSt8TWX7APstADnSJpUJ9gcoMEYv1DcPH4Iym/nu Xkurx+75wNr/Uca1zyu7ajExWisbZxyaC4cOdGd7NvD6PbkIXNkTb84iPqnP8YDmZ7Ec g7tsq0QPURobniQ4ExSxMSClEM4gnxbIpzHIRNe5aGV+xvdt86PTvOSx3OKoRGyyhP3y 61oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=M6ti51H3; 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.09.11.03; Wed, 12 May 2021 09:11:03 -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=M6ti51H3; 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 S237344AbhELPuB (ORCPT + 12 others); Wed, 12 May 2021 11:50:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:40102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234513AbhELPo0 (ORCPT ); Wed, 12 May 2021 11:44:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 53CD361C8B; Wed, 12 May 2021 15:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832961; bh=x6IIQ3xVA6PrYrrXSvlR0k9iFErrr00WFalA7SC+nP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M6ti51H3QHPJ5p32jKcr/GhITOxHE0g7Z4DCVBMBtUhQ0ZdSdmWqWRniKn9npzb4z qIRJTDMNw4VkkIIJabbXNqZZ0Sd1d9bZB1ScWjlATCYdjuPDz49KSjcskc+XJ+GcNW HnMq7RdHm/0a8ERVhrw4PhAy9vdZS6kEt87lYCUM= 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.10 494/530] net: enetc: fix link error again Date: Wed, 12 May 2021 16:50:04 +0200 Message-Id: <20210512144835.989992361@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@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/