Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3891227ioa; Tue, 26 Apr 2022 11:46:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVID1/6TuZS6ov7WWEqWjOCj9R16zklhFPBOimc8pC9ualhaNfynKOEZUHXALyW1pmViPV X-Received: by 2002:a17:907:9622:b0:6f3:9797:8eaf with SMTP id gb34-20020a170907962200b006f397978eafmr10947963ejc.96.1650998808351; Tue, 26 Apr 2022 11:46:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650998808; cv=none; d=google.com; s=arc-20160816; b=q3b0XfzRYtTSK0hcKCXwIN2kmJheK6QNJA3D3Y7qgafwnMHqyQrOwJ0nErVCa7ToFT 4onGJyWg4TBPtRFc5thdSHXRIB6W7O/oV6IQx5Nh78nnjGSuIvJgImiiQBGG78sIzXfn BS2Ow1FgJeeW/glW1tOc1Cz3PQoioGrH726pq7S+ubtpHphdXhdbruCvhdy2k+B+xp67 LjcROYi3noyAFmdfMQaHipQfLeajC/LdceAAfpgj5/Yp2RGoy/+p2Cq4IgQT34vCiUaB +0fHWXj/8bVXVU/PcOGUlRXamkuj53XJ4ttXM46LIpy9N+aWHWVDI7qEhLLUxleFioZp FGAQ== 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=SG2OibbibUUiNX3DWo8fpjjgMMpZpcHB9FW7RcL0lrA=; b=cT99JoQtCtXZ5YyZ5RUwH1huMErnUYY/11gHqv9b5Fov8b/775Bfk4dOk/coCoRRr9 yLzh9RAbbP2chC7k4atgSV/ic8Pe2CJuwYC4wyFDLR9oNS0HKUvqixKLW/bnYuWZSqcn ghYR0ANnc4FGSm1GLWGljTOlqqxte1YamdSOrWt3oHABS/BZkP1zdnf58snjMbStj7kv 9WlgUJV1faPDR4jEzIRmPbWWpWWWZkpoSWqOC1aJ0h3pGPzAHw9ZNw7KlqR6gcfjZwjy Mqv2PfV8ZpWYwvH/kcnNpDXX4hVNA3RiWtdD5xpUZfeAMo3OA0AVTzuRe8qnaopAD0vT RIgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QrsMleYu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w11-20020a05640234cb00b0042600db8095si1274186edc.188.2022.04.26.11.46.24; Tue, 26 Apr 2022 11:46:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QrsMleYu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S1346306AbiDZJAJ (ORCPT + 99 others); Tue, 26 Apr 2022 05:00:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346870AbiDZIp1 (ORCPT ); Tue, 26 Apr 2022 04:45:27 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 818967DAA4; Tue, 26 Apr 2022 01:36:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3EC3DB81D09; Tue, 26 Apr 2022 08:36:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 758C1C385A0; Tue, 26 Apr 2022 08:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1650962162; bh=70qI1yjsoDgEU4yMqhafU1+UfBm/Xmzov+B9musjrjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QrsMleYuf64SZnN9G9ghYNShZh2RqCDNt+C23bse3D8rSWLzQDg8PE3zLXD09/F/y XNdQgql5tvyBci7I43Sf74v9etcsxFDHsOCWe9g8ObYbJ/e03UH9cgNt0r5p7xZrtC uvZIiuSw8gjNQmlVNm8TMqwuG6EYQyeeNnTR1rv4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Marek Vasut , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Randy Dunlap , Sasha Levin Subject: [PATCH 5.10 86/86] Revert "net: micrel: fix KS8851_MLL Kconfig" Date: Tue, 26 Apr 2022 10:21:54 +0200 Message-Id: <20220426081743.697134831@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220426081741.202366502@linuxfoundation.org> References: <20220426081741.202366502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marek Vasut This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125 which is commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream. The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y . Signed-off-by: Marek Vasut Cc: David S. Miller Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Randy Dunlap Cc: Sasha Levin Cc: # 5.10.x Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/micrel/Kconfig | 1 - 1 file changed, 1 deletion(-) --- a/drivers/net/ethernet/micrel/Kconfig +++ b/drivers/net/ethernet/micrel/Kconfig @@ -37,7 +37,6 @@ config KS8851 config KS8851_MLL tristate "Micrel KS8851 MLL" depends on HAS_IOMEM - depends on PTP_1588_CLOCK_OPTIONAL select MII select CRC32 select EEPROM_93CX6