From patchwork Fri Mar 24 09:37:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13186599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A959DC6FD1C for ; Fri, 24 Mar 2023 09:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Message-Id:MIME-Version:Subject: Date:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=VjhTgC7nKoZOi2IZbIwFZ0L4jlIjr9QpamZ/q6OLDZM=; b=YASIixvE1+fOf7 3Y5o+Ll2/bsJJI4mD2Bx3NrFMbBKE0208j2/qEzn7/Z0en/0u/RxZIAAI1R9nlhp8eY+zksF456zV PBCq3D/Xa/NhN0Uq0fkpJwWvfUjGdmJ/F7vT0KPx2bGWocTKQU8+zHVBgYv0mP5JoOQ/xTnAOh3YF cggVgm9eV339i1UITsvyQXL0Wyr6MOiconaD+vN3o318cbV/pWJRjbFDBqiEr7A43sp0wxuvIXv04 Ntfzo/475C+InUL9vabOcshZhd0qtYlXk9/zuFvoN4Wvni5MQOxaGdDcdWiUno4xNwK7ovoi70cN2 0w2Q1HT9WbG7tXb8QfeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfds3-0042oJ-3B; Fri, 24 Mar 2023 09:38:04 +0000 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pfdrz-0042mK-0r for linux-arm-kernel@lists.infradead.org; Fri, 24 Mar 2023 09:38:00 +0000 Received: by mail-wm1-x32e.google.com with SMTP id v4-20020a05600c470400b003ee4f06428fso548448wmo.4 for ; Fri, 24 Mar 2023 02:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679650676; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=Xo+N+zh7l2Lx3IrEo7K+kadeIQouJNq22XibHO/II/E=; b=euR8iyBOS7GSUEIvAnONkwpFddBnabdrZW2vsdAQpYiSivWX15hbHfdWbBk9aBRhhx g/QrYs2NfN+ixKmILhdMfW3PRfSSiOz4mmNKAYlR++x8LqQLKeLUUG371mpqqlXQtfhT EkOOtG3PkXyjv0zZVCxqCdlxShertr9Ng26j48hR+QqDTX0WWHCrcigx39uiSJlSk6uw Y6fJv/dLxuclxC5mcA3Sm00iO20BpWa5A3KqHbWbK8S7BAXlheemhWOxugP+14C9T5tD yFTFdJAZsC13iBu72lgecUn/Jnp6yT0zn32b2tmLTCTVfsdFmkCEkVuvELd4sDk4X1yp gIyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679650676; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Xo+N+zh7l2Lx3IrEo7K+kadeIQouJNq22XibHO/II/E=; b=4LfKUKgBN2krD/6ySwGrjZv6+mFmoGzTwuqltr6ldcbC/0ZMDbZtvvlm+6hPIUdF80 hTZAI/pMaKi+Y6nqST/FRM+jYChUke46Bb6dS1pAnBBUL+oXAMtqigRGzAWgqAUHAZv4 NsMeKK0Xr6uZccF2Ap6hJbjW4XP6QjL4BfIBykfb4vHyyANZpLyIjKvDGRM4Ia2y6iMv 2usaYvVgg+05WQF6Os49QKUYYiVzJner4X/GcBfdqOZFCcrA+QXQNLWW2d4TWH9GNxDE zxNHIyHR1Vt4GVB4Np2mqcq3SUkEvSa5dqGvtKmrGOXN0nN/Da93TWj1h/kZBilzIN3L R8+Q== X-Gm-Message-State: AO0yUKVM8CSu9KjyCFhfBz2GUpUT5l/pFM+6wvufLogfpGbO8artp03y y+wu6RBxjFLfvj4lM0z6Q0auAg== X-Google-Smtp-Source: AK7set/ctZ50Tt1iJTlpemO+Af8Nfpb00/mJ9XozvF8VCFFVkLMpJwQGxdngulEu6b8lGYZPW4zvlQ== X-Received: by 2002:a1c:7412:0:b0:3eb:98aa:54cd with SMTP id p18-20020a1c7412000000b003eb98aa54cdmr1814451wmc.17.1679650676045; Fri, 24 Mar 2023 02:37:56 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id h13-20020a05600c314d00b003ee9c8cc631sm3406853wmo.23.2023.03.24.02.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 02:37:55 -0700 (PDT) From: Neil Armstrong Date: Fri, 24 Mar 2023 10:37:54 +0100 Subject: [PATCH] arm64: defconfig: remove duplicate TYPEC_UCSI & QCOM_PMIC_GLINK MIME-Version: 1.0 Message-Id: <20230324-topic-sm8450-upstream-defconfig-fixup-v1-1-2d75cc9b3c3d@linaro.org> X-B4-Tracking: v=1; b=H4sIAHFvHWQC/x2NywqDMBBFf0Wy7kAexj5+RbqIcaIDmoSMKQXx3 xu6PIfLuadgLIQsXt0pCn6IKcUG6tYJv7q4INDcWGipjTS6hyNl8sD7o7cSauajoNthxuBTDLR AoG/NYKwanA3P++CUaK3JMcJUXPRrq8W6bU3mgm39Px/f1/UDkteAMowAAAA= To: Konrad Dybcio , Bjorn Andersson Cc: Stephen Rothwell , linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong X-Mailer: b4 0.12.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230324_023759_310398_DB9EAB6B X-CRM114-Status: UNSURE ( 8.08 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Both configs were already applied by 2 separate changes, fix this to avoid: arch/arm64/configs/defconfig:989:warning: override: reassigning to symbol TYPEC_UCSI arch/arm64/configs/defconfig:1232:warning: override: reassigning to symbol QCOM_PMIC_GLINK Fixes: 4ffd0b001956 ("arm64: defconfig: add PMIC GLINK modules") Signed-off-by: Neil Armstrong --- arch/arm64/configs/defconfig | 2 -- 1 file changed, 2 deletions(-) --- base-commit: eba6ffc6c33353bb95c5d2bde35bb80e21c1f713 change-id: 20230324-topic-sm8450-upstream-defconfig-fixup-3516a5f976a1 Best regards, diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b6e437486537..c4f231b70898 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -274,8 +274,6 @@ CONFIG_BLK_DEV_NVME=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_FASTRPC=m CONFIG_BATTERY_QCOM_BATTMGR=m -CONFIG_QCOM_PMIC_GLINK=m -CONFIG_TYPEC_UCSI=m CONFIG_UCSI_PMIC_GLINK=m CONFIG_SRAM=y CONFIG_PCI_ENDPOINT_TEST=m