Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3715348pxv; Mon, 26 Jul 2021 10:05:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDX97QLGmhBOSWL2g9iZboTOIhxJFGztH3au6BmsX0OQQRZ7SoHQuYaTFaHvSFi1/yRknb X-Received: by 2002:a17:907:7296:: with SMTP id dt22mr18202310ejc.86.1627319104793; Mon, 26 Jul 2021 10:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627319104; cv=none; d=google.com; s=arc-20160816; b=RMs4IlN2NqQhJoLEEGaREvG71RrIKB2aaCtxyZwGsVu+Dr7eoUNtbc0h5JgxjRVfy4 tmr9k1GkahAYxEpMCP8RQ4pdmJCQyi4aQ2QFpiohC+aMYbK26KmaIDfnIqtY5yS8nJvO b+/V447VrQWYAarEDEd0vlqPB9JEGg11EMoj0BlIe0Wgp8F7axm1HB2wQL42nvChZBA5 99kQMFgTm9QSeMJxbPMzssrG84J6ZCSRh8mpCGqbT3G/DLHqfBkmpEmZ+l/wpQUd44s9 0EAGXi2KLRjC3PcxAr1dk2Y/9noDPhUEf2U6y8zQOAO/BphqnIt9l0ObCYNo2Hqe676/ rGdQ== 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=bbU3wprBbwRJgQkUQsYIL/YU1cGC9FfckKaToeRoeo4=; b=ktj4v52qxw31nsMOHIrX3hjfx0/fjaLdHY5JNSXHsYA1rEaHNyjauyozvd10kFDmra FNaEPWhoBOycFEzDGVzeL79KEdSn30jzT7qNPkTQlbyn7Jem/Jv+IAd/c6Fd8N4U7/G0 S93T6dOhcLGuo95/2gZ7Tzi0NoEDVXiAzj3aQ2zYhJaN4Hwalgde1AOaVZsDnEFqjaD+ 8K6rJViRyPwvREJkuYW5e6RwAoUXYF0Z6Ya8QywAZVKBtIOXRFOiZ4I2miblQXnd2u0r CZRFfbWDQQht+7824vClS54TvXPA55iCcesjkicmoc9gaP7BaP9VG568pdHgUwk42Ovn 7V1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XtPW9CkM; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n8si504725edy.15.2021.07.26.10.04.41; Mon, 26 Jul 2021 10:05:04 -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=@linuxfoundation.org header.s=korg header.b=XtPW9CkM; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237305AbhGZPjw (ORCPT + 99 others); Mon, 26 Jul 2021 11:39:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:37450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237395AbhGZPWl (ORCPT ); Mon, 26 Jul 2021 11:22:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C7F360EB2; Mon, 26 Jul 2021 16:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627315390; bh=6zjvGesrqqih2bmgSj78nVec1w2WkC82+VvLKUOBEw8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XtPW9CkMJ7PKG1vY8n2bIwH1UT+fFp/k3NkMXPCw4Bw4nHiGskFDg4RuzHpJQ+wu/ KKXYrzZS0L0smIaiHPmPwGW8eErLzjq7l44aSso4SP+1wkwA8Jvsjn5nsQ+Am5Ztgj mxxu1mHgo0qCW732See2xKXKJIxIcrHQtgiFsSe4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Richter , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.10 078/167] ACPI: Kconfig: Fix table override from built-in initrd Date: Mon, 26 Jul 2021 17:38:31 +0200 Message-Id: <20210726153842.024682725@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210726153839.371771838@linuxfoundation.org> References: <20210726153839.371771838@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Richter [ Upstream commit d2cbbf1fe503c07e466c62f83aa1926d74d15821 ] During a rework of initramfs code the INITRAMFS_COMPRESSION config option was removed in commit 65e00e04e5ae. A leftover as a dependency broke the config option ACPI_TABLE_OVERRIDE_VIA_ BUILTIN_INITRD that is used to enable the overriding of ACPI tables from built-in initrd. Fixing the dependency. Fixes: 65e00e04e5ae ("initramfs: refactor the initramfs build rules") Signed-off-by: Robert Richter Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index edf1558c1105..b5ea34c340cc 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -359,7 +359,7 @@ config ACPI_TABLE_UPGRADE config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD bool "Override ACPI tables from built-in initrd" depends on ACPI_TABLE_UPGRADE - depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION="" + depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION_NONE help This option provides functionality to override arbitrary ACPI tables from built-in uncompressed initrd. -- 2.30.2