From patchwork Thu Sep 16 15:57:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 512977 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1354645jao; Thu, 16 Sep 2021 09:08:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJznZZODRHufjbcSs6j4s65nwoPes1mdJtK2etlOdpwYr+GTvGmEhxJPq4Wk/MAhQDcH/oOI X-Received: by 2002:a92:d0d2:: with SMTP id y18mr4604075ila.80.1631808501673; Thu, 16 Sep 2021 09:08:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631808501; cv=none; d=google.com; s=arc-20160816; b=oY+rIaGetwyp0gD9VsWy3fV7RIfivfmPlsIn2SQTGPwk8M9qdLu2Q3PR6/iYLf0BeR TslAgwbEB54lO9yT40N87SlqkdadKmtn7xU8tOyZ9iyGVNgdwrxJfDOOzNH+7eyrOwWD qYnKp648t9gLdcQ2pEx5py+bV9sQ4Jpm1UFJ6fyz9zPZKM2qW0RXMW7aobxC6U0Kc7f/ iyI3mjp5ZlG0+ituuj6TiGdC5FhcCS0S65mnTDWhKRht87lKYhIyt35AGRNueSgusboc FH9TrTF+KITkyGn0ckb8/JHcPoo8HNHZES2p4xc72XeDOtKQ6rv36UBPWH0gUv1qiYWI hvvA== 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=DahroymjXH85XnxE6kguXTaH7SydrMzpbzw2C5F2I4E=; b=TWYE1+Pl/mLO+GgsjyFlA98dtrllT+26i5NGKJyPdjQYyu9oxY2gxaN4bIulicBI+o MDWpCyDIkhiJp8o952QjcYA9vStLAg2eYYJFhvA3vzF6dlGaivUiK8X5XNJ3Jqmm/hOT l1bkk8B2GW1TJWEc4znXS+6ADPV48LqQAXuVsK/iLJNWtNAvXWnRXWkngwLnW4JXb+YJ DUv8CjXa41lKJtIjxEwJ5f/2OP0ZCZHc31LSc8UFHMMnPrRYyqQz6Bn/zdMj04n3tgm9 FBfZmpbYBAWOzwHlQDFsE92iiXs4wTOoWEPBfh7qgh43eglVBXuG+w9R48hELaDt+T1j 3oxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NrC1Rqt5; 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 e17si3242370iot.109.2021.09.16.09.08.21; Thu, 16 Sep 2021 09:08:21 -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=NrC1Rqt5; 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 S232915AbhIPQJj (ORCPT + 11 others); Thu, 16 Sep 2021 12:09:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:48850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233709AbhIPQIc (ORCPT ); Thu, 16 Sep 2021 12:08:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0828361356; Thu, 16 Sep 2021 16:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808431; bh=zv2U393LUqG9qv8Squqau6qezSl4qKipcRyNbdq6g+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NrC1Rqt5sXBbquImXfuKAyC2KOI473zrC2lTtWlTYgkJB7fPgdg9c5oFSMQHmuRSf Ni0J6bvPJHuxhSz+ip/MLGsBPSNqHWcuHLrQHFQQdDHsKrNl+7zv26dLQVoi7dBYyA dEbi2A1jYAYsZ0ICMh+tejOOMwxdgVzmbjfumpRo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Christophe Leroy , Michael Ellerman , Sasha Levin Subject: [PATCH 5.10 088/306] powerpc/config: Renable MTD_PHYSMAP_OF Date: Thu, 16 Sep 2021 17:57:13 +0200 Message-Id: <20210916155757.063308632@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joel Stanley [ Upstream commit d0e28a6145c3455b69991245e7f6147eb914b34a ] CONFIG_MTD_PHYSMAP_OF is not longer enabled as it depends on MTD_PHYSMAP which is not enabled. This is a regression from commit 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"), which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays in the config, as Christophe said it is useful for build coverage. Fixes: 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c") Signed-off-by: Joel Stanley Acked-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210817045407.2445664-3-joel@jms.id.au Signed-off-by: Sasha Levin --- arch/powerpc/configs/mpc885_ads_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 949ff9ccda5e..dbf3ff8adc65 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig @@ -34,6 +34,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y