From patchwork Thu Mar 31 17:28:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1611868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=KgoasuWI; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KTqzT71DNz9sGF for ; Fri, 1 Apr 2022 04:29:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nZybV-0000If-Cy; Thu, 31 Mar 2022 17:29:01 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nZybT-0000Ha-T1 for kernel-team@lists.ubuntu.com; Thu, 31 Mar 2022 17:28:59 +0000 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 915143F7F2 for ; Thu, 31 Mar 2022 17:28:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1648747739; bh=PIqjVN3zO+TYfkONIAXAX6frAVtSO+kPLq2nP3Edp/k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KgoasuWIb/D/EOcMxulSQiikJhGkTf9yQBFjRVcNNEAC0zwhq1HRyVWcbBOMc5+XG dY8/lV1wwOsjtb002ewxB6gK45vjaIe28iJoHiBMReD2pUX+J2BculdmBCoPFYkalh ZO5F9AEdhRFr7S+7SlystHkwir22pVeIJTBDZP7E/AhC8Zn9EOjYTEfgl0N3MdTMUW LzGI+nMsIfcyIdkELpA8PgnZmk5/0lVCG/OrLLZ2PpWbdwZ1Svxp5pHrq4pde1IGaD 2EfE8kbPT/RmuksdpTyFM0a8ISRw0OvD3IlQoqFSUic+Jp99v+WWNmeAd9u8XnSSx+ ugY1TO84kw2DA== Received: by mail-pl1-f198.google.com with SMTP id x18-20020a170902ea9200b00153e0dbca9bso102138plb.9 for ; Thu, 31 Mar 2022 10:28:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PIqjVN3zO+TYfkONIAXAX6frAVtSO+kPLq2nP3Edp/k=; b=gSNhUAw8jzZxpljBBVVeMgSEmYG87w4oqTDUn+TKjaIZSPEtgl9A733/qmwZyY/VsA oloanT5w7TjjPmrugeKV8pLr7Ql9LpJaP761YR/72zMPffQ1lhVLn/pV/GQ/rXuQNOnw GdXQgaw33oqaAMINLJTcRHDSgjyABcf0NMmKeBwNF2IpeZAvame0cG0mCtzIadYckP5b 3tuwm27XR2BAsDnfMDJx1SVFODEzlTjiQQUnXcj0/2oi6EIQOb2vOTPkFROruwiPPn+/ 74ubq4aqMoeX8fTXxPxBS6j6MIV2mxyCMK4VmF4kktUDgTDAgS80nmqbNpUh7z/iI6uP YdFw== X-Gm-Message-State: AOAM533Wgf4Z477MmwKof81xupuYxGILoS8YQ4G6/kkSQ9NKKiejyPFM ruW4N4XJ2uryLFH09EB3RwzK09YgDptnc7E1lvv+To0Id/rE5z16lYzLlEJx8AYBkoiYmSKn5BE 3oOuzFnzNI9d6BYZ6tYOQCXbPpXkLyELL1zR9YHf13Q== X-Received: by 2002:a05:6a00:4096:b0:4fa:8f23:e972 with SMTP id bw22-20020a056a00409600b004fa8f23e972mr6728419pfb.26.1648747737505; Thu, 31 Mar 2022 10:28:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKLOCwMDSagBd78LvLnp1b+EnSyX09Lqxbkf6+U9pMQa5VusZ+ILvb6OELLZEL5S5VQne3ew== X-Received: by 2002:a05:6a00:4096:b0:4fa:8f23:e972 with SMTP id bw22-20020a056a00409600b004fa8f23e972mr6728399pfb.26.1648747737184; Thu, 31 Mar 2022 10:28:57 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id h14-20020a63b00e000000b00380e306e8f2sm23442569pgf.30.2022.03.31.10.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 10:28:56 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH][focal/linux-azure-5.13] UBUNTU: [Config] azure-5.13: arm64 CONFIG_HIBERNATION=y Date: Thu, 31 Mar 2022 11:28:44 -0600 Message-Id: <20220331172846.10229-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331172846.10229-1-tim.gardner@canonical.com> References: <20220331172846.10229-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1967336 Signed-off-by: Tim Gardner --- debian.azure-5.13/config/amd64/config.common.amd64 | 3 +-- debian.azure-5.13/config/annotations | 3 +++ debian.azure-5.13/config/arm64/config.common.arm64 | 3 +-- debian.azure-5.13/config/config.common.ubuntu | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian.azure-5.13/config/amd64/config.common.amd64 b/debian.azure-5.13/config/amd64/config.common.amd64 index 306da5ca657c2..843cf5c657cab 100644 --- a/debian.azure-5.13/config/amd64/config.common.amd64 +++ b/debian.azure-5.13/config/amd64/config.common.amd64 @@ -29,7 +29,6 @@ CONFIG_DW_XDATA_PCIE=m CONFIG_GPIO_GENERIC=m CONFIG_GPIO_GENERIC_PLATFORM=m # CONFIG_HARDENED_USERCOPY_FALLBACK is not set -CONFIG_HIBERNATION=y CONFIG_HID_PLAYSTATION=m CONFIG_HID_SEMITEK=m CONFIG_I2C_CP2615=m diff --git a/debian.azure-5.13/config/annotations b/debian.azure-5.13/config/annotations index 4a2a1cd9b69ed..bbc9949648373 100644 --- a/debian.azure-5.13/config/annotations +++ b/debian.azure-5.13/config/annotations @@ -4,6 +4,9 @@ include "../../debian.master/config/annotations" +CONFIG_HIBERNATION policy<{'amd64': 'y', 'arm64': 'y'}> +CONFIG_HIBERNATION mark note + CONFIG_FB_EFI policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_FB_EFI mark note diff --git a/debian.azure-5.13/config/arm64/config.common.arm64 b/debian.azure-5.13/config/arm64/config.common.arm64 index c509e0f20e079..326278b644941 100644 --- a/debian.azure-5.13/config/arm64/config.common.arm64 +++ b/debian.azure-5.13/config/arm64/config.common.arm64 @@ -29,7 +29,6 @@ CONFIG_EXTCON=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_HARDENED_USERCOPY_FALLBACK=y -# CONFIG_HIBERNATION is not set # CONFIG_HID_PLAYSTATION is not set # CONFIG_HID_SEMITEK is not set # CONFIG_I2C_CP2615 is not set diff --git a/debian.azure-5.13/config/config.common.ubuntu b/debian.azure-5.13/config/config.common.ubuntu index 76daf1430ee01..df91a08550f48 100644 --- a/debian.azure-5.13/config/config.common.ubuntu +++ b/debian.azure-5.13/config/config.common.ubuntu @@ -1670,7 +1670,6 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_BTF=y -CONFIG_DEBUG_INFO_BTF_MODULES=y # CONFIG_DEBUG_INFO_COMPRESSED is not set CONFIG_DEBUG_INFO_DWARF4=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set @@ -2864,6 +2863,7 @@ CONFIG_HI13X1_GMAC=y CONFIG_HI3660_MBOX=m CONFIG_HI6220_MBOX=m CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y CONFIG_HIBERNATION_SNAPSHOT_DEV=y CONFIG_HID=m CONFIG_HIDRAW=y @@ -5183,7 +5183,6 @@ CONFIG_PAGE_POISONING=y CONFIG_PAGE_POOL=y CONFIG_PAGE_REPORTING=y CONFIG_PAGE_TABLE_ISOLATION=y -CONFIG_PAHOLE_HAS_SPLIT_BTF=y # CONFIG_PANASONIC_LAPTOP is not set CONFIG_PANEL=m # CONFIG_PANEL_CHANGE_MESSAGE is not set @@ -7296,6 +7295,7 @@ CONFIG_TRACING_SUPPORT=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_TRANS_TABLE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y # CONFIG_TRIM_UNUSED_KSYMS is not set