From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B477BC433E6 for ; Mon, 8 Mar 2021 09:52:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 85317651E6 for ; Mon, 8 Mar 2021 09:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231190AbhCHJwA (ORCPT ); Mon, 8 Mar 2021 04:52:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231202AbhCHJvd (ORCPT ); Mon, 8 Mar 2021 04:51:33 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67926C06175F for ; Mon, 8 Mar 2021 01:51:33 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id a18so10674653wrc.13 for ; Mon, 08 Mar 2021 01:51:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=+G3FrRFu9LNWKFjF3mvuFBF1Z6whzll6UPpQw6o1RMU=; b=oCZDuwnfC5NL1NcfVpNUQIqILApB7oIaVDsflwsOvwcQfVpYuQvcM4FIc0AVtS7MB7 FAtZS7ukGqo0f6Cp1P7/MNTkA9JGH3U28o0RVXJzA65vuzhA4XrWUwVk+jZ0EQURMgXY gKe6IqX7naHflMZZN8hpm8hjPCSa9e0qETlBvN19JDLdcnQkHNejkmxaBmzumOsmWUcy vVvMQW9O41B107+zof6PZ/yGpJuasl48S/WHPkLjJV59fFNvvUq0LHd2rdJ6zFiTL1WW go9jT+qI6HcUkd3fGuU2WcbM5QQoRdbjpkqsGWzh6TKJRtXmwrLQU6EucPDIn7Wczzxf uN7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+G3FrRFu9LNWKFjF3mvuFBF1Z6whzll6UPpQw6o1RMU=; b=m1dExSVrd6XjHluhODyVLpf8zOxBqt6PhnzulwcjQ9qFQ1ekWUQOu3HyFQdeAFqDUT NWg6ZojWiM90ffeQcTFPu1Gh49jH0WlLO8UnAFwoAX+XCSRcpNevbhzb9bXhPdwf9mv/ cQ+QXlBjcXgKMmpJqHVfutvRjzb9CoSr++dD6CEKacsAirxPNCik5S1W98KY2AEe6JXc CENsJS5bkunlI32+JUUbGzuyw1JvyYdSy0S2zXIKCJEYZHbCPVUqbmD+C/0PnQlOFn2a adagyCZwDg5X89khbkBcBY0UMNUao3t16eUZO6oJCJ2VundKTKgYwlNY1VTW9+5BEIPx +Kiw== X-Gm-Message-State: AOAM530LVllE+rjyv9qWxww1QEQyfQYwTRn/Y/LTsGyDWIAhmVbZjfF4 Pwlmdv+QzFOFzMRuvYMW8J0guKYBtMH47w== X-Google-Smtp-Source: ABdhPJz973dd9NFengBsgLpznb3kVDIH97oR/FBBHDWMYkQVfUGweDOcnZzz7l812eO2itwBV4p2Lg== X-Received: by 2002:a5d:5411:: with SMTP id g17mr22137267wrv.194.1615197091528; Mon, 08 Mar 2021 01:51:31 -0800 (PST) Received: from localhost.localdomain ([163.172.76.58]) by smtp.googlemail.com with ESMTPSA id 12sm18187731wmw.43.2021.03.08.01.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 01:51:31 -0800 (PST) From: Corentin Labbe To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, Corentin Labbe Subject: [PATCH] sparc: sparc64_defconfig: remove duplicate CONFIGs Date: Mon, 8 Mar 2021 09:51:26 +0000 Message-Id: <20210308095126.8514-1-clabbe@baylibre.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After my patch there is CONFIG_ATA defined twice. Remove the duplicate one. Same problem for CONFIG_HAPPYMEAL, except I added as builtin for boot test with NFS. Reported-by: Stephen Rothwell Fixes: a57cdeb369ef ("sparc: sparc64_defconfig: add necessary configs for qemu") Signed-off-by: Corentin Labbe --- arch/sparc/configs/sparc64_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig index 148f44b33890..12a4fb0bd52a 100644 --- a/arch/sparc/configs/sparc64_defconfig +++ b/arch/sparc/configs/sparc64_defconfig @@ -93,7 +93,7 @@ CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_SUNLANCE=m -CONFIG_HAPPYMEAL=m +CONFIG_HAPPYMEAL=y CONFIG_SUNGEM=m CONFIG_SUNVNET=m CONFIG_LDMVSW=m @@ -234,9 +234,7 @@ CONFIG_CRYPTO_TWOFISH=m CONFIG_CRC16=m CONFIG_LIBCRC32C=m CONFIG_VCC=m -CONFIG_ATA=y CONFIG_PATA_CMD64X=y -CONFIG_HAPPYMEAL=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_DEVTMPFS=y -- 2.26.2