Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2900525pxb; Tue, 24 Aug 2021 10:11:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB1UZCnjWwCvcxEpfKmQxxF83fvTOVX1zkpZmhgev38s7/kzTGS0zL3w/fqxGTYAnj7bnG X-Received: by 2002:a5d:990c:: with SMTP id x12mr12472969iol.122.1629825061582; Tue, 24 Aug 2021 10:11:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825061; cv=none; d=google.com; s=arc-20160816; b=kXpdLp+hrOZsvqenQt2Gk+xD8WBoXqDSyXYveOlKp/3l3raWZzMjQnsjQNWyEmhR92 x/emlm/9Ibq7bj/ijyfrEipA62+vow3XMMfMD+BiIB0puPmx0e3g5n+cQIw6O2Bm7ltP LtbgZYciI6e+Wj9o1H9MBIvCs1toorvqLZ9crsldQdOH/622wXys/r7Qt4evvOXiZP6T 8p50ZakRSYDVRe2fvedOJHiAy37zVgcUvc30oCNwnpvgBGWJM+4EkCoykyUWpv9P6lOZ Qw+Fs+ftUdgk4zetuXdXbAeX/gDMjs8eqpWMzKcl39zuEYoplR5WlC1ljcYNLaZLhOew Up4Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sSzG2In+NpxRXtbO6d9KRXm+UaPNFsaw+qbxew025aI=; b=EooH1h9cObuL/3hQjjjWGF4YwNTwEQuca/LKEBM+ZQK8aX5zDJDrtHR96MOrSwqUcV M6z28GdzxLtGFdBfLfOmaWHxsw3oUag7bw4/p0IOPVDUufpPO6i6ShPlNw8KS/Z9Pd3/ y60Hsiv0wIfXaS2Av4CwfV05Xzxu08zdpdNIco/2fBx8hihosf/tvoTlkIlBqzD9tDrf kUq7El2cBHxkVckA2UfqiYFNYB+LsQolIuiLSAscgbAsp3LN9RzXB5eDFJrk+UGEiQQ0 aSRK3NFhPQ4Mzo/4wwc+8Br4KXufWRaJPaG8kC2QwjOY/aX/JaKteqOUDH6cUVv1+mqh EoeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Zsa2YdP0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r10si18478631jap.64.2021.08.24.10.10.50; Tue, 24 Aug 2021 10:11:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=Zsa2YdP0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235104AbhHXRK3 (ORCPT + 99 others); Tue, 24 Aug 2021 13:10:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:47438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239024AbhHXRIE (ORCPT ); Tue, 24 Aug 2021 13:08:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BB00461A38; Tue, 24 Aug 2021 17:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824403; bh=aXang1viFh8gd2lw1E6A5ooGAb/t8CsBx7L5U6AMAxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zsa2YdP0oaJKd38/dCQ6dm5G7GZszCVivxxcBBKp6yihy7JCg5Wy78Nr7ObPgplRZ gxGPkuXJEW1Dkn5QZNE/Dt7XF9s4FlsBTIfLOOS8LzouL0WTv2H11c9xTXzSew+l5Y ItRlbJyRB5bQ+g4voF9l+8OjWOipODLsZEElmn4IdEDd/RIyvzBSpChC7sj/S4riNF NBxy1hwkihMD1ntwwC3gaRU6AFR7tcw3B7qTpAFqCzC73/fLi+05xUzEz5xUE8BE47 WpMFOT/oJZ2J5/G1A+KmgrG/ZuFRBWFY02+5wOEWxVaHkB6gPT+kBQ5vrh+VyvBzdf 3SrHKULjQYsSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , kernel test robot , "David S . Miller" , Sasha Levin Subject: [PATCH 5.10 54/98] ptp_pch: Restore dependency on PCI Date: Tue, 24 Aug 2021 12:58:24 -0400 Message-Id: <20210824165908.709932-55-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165908.709932-1-sashal@kernel.org> References: <20210824165908.709932-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.61-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.10.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.10.61-rc1 X-KernelTest-Deadline: 2021-08-26T16:58+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Shevchenko [ Upstream commit 55c8fca1dae1fb0d11deaa21b65a647dedb1bc50 ] During the swap dependency on PCH_GBE to selection PTP_1588_CLOCK_PCH incidentally dropped the implicit dependency on the PCI. Restore it. Fixes: 18d359ceb044 ("pch_gbe, ptp_pch: Fix the dependency direction between these drivers") Reported-by: kernel test robot Signed-off-by: Andy Shevchenko Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/ptp/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index deb429a3dff1..3e377f3c69e5 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -90,7 +90,8 @@ config PTP_1588_CLOCK_INES config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" depends on X86_32 || COMPILE_TEST - depends on HAS_IOMEM && NET + depends on HAS_IOMEM && PCI + depends on NET imply PTP_1588_CLOCK help This driver adds support for using the PCH EG20T as a PTP -- 2.30.2