diff mbox series

[v2] UBUNTU: [Config] azure-5.13: arm64 CONFIG_HIBERNATION=y

Message ID 20220404145432.12265-1-tim.gardner@canonical.com
State New
Headers show
Series [v2] UBUNTU: [Config] azure-5.13: arm64 CONFIG_HIBERNATION=y | expand

Commit Message

Tim Gardner April 4, 2022, 2:54 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1967336

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

v2 - updated Focal chroot with correct dwarves package.

 debian.azure-5.13/config/amd64/config.common.amd64 | 1 -
 debian.azure-5.13/config/annotations               | 3 +++
 debian.azure-5.13/config/arm64/config.common.arm64 | 1 -
 debian.azure-5.13/config/config.common.ubuntu      | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

Comments

Bartlomiej Zolnierkiewicz April 4, 2022, 3:58 p.m. UTC | #1
Acked-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz@canonical.com>

On Mon, Apr 4, 2022 at 4:55 PM Tim Gardner <tim.gardner@canonical.com> wrote:
>
> BugLink: https://bugs.launchpad.net/bugs/1967336
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>
> v2 - updated Focal chroot with correct dwarves package.
>
>  debian.azure-5.13/config/amd64/config.common.amd64 | 1 -
>  debian.azure-5.13/config/annotations               | 3 +++
>  debian.azure-5.13/config/arm64/config.common.arm64 | 1 -
>  debian.azure-5.13/config/config.common.ubuntu      | 2 ++
>  4 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/debian.azure-5.13/config/amd64/config.common.amd64 b/debian.azure-5.13/config/amd64/config.common.amd64
> index 9bad458b52993..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<ENFORCED> note<LP:1967336>
> +
>  CONFIG_FB_EFI                                   policy<{'amd64': 'y', 'arm64': 'y'}>
>  CONFIG_FB_EFI                                   mark<ENFORCED> note<LP:1959216>
>
> diff --git a/debian.azure-5.13/config/arm64/config.common.arm64 b/debian.azure-5.13/config/arm64/config.common.arm64
> index c7f8cd0203444..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 13d21904c42e8..19de4151f77dd 100644
> --- a/debian.azure-5.13/config/config.common.ubuntu
> +++ b/debian.azure-5.13/config/config.common.ubuntu
> @@ -2864,6 +2864,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
> @@ -7296,6 +7297,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
> --
> 2.35.1
Philip Cox April 4, 2022, 5:02 p.m. UTC | #2
Acked-By: Philip Cox <philip.cox@canonical.com>

On Mon, Apr 4, 2022 at 10:55 AM Tim Gardner <tim.gardner@canonical.com>
wrote:

> BugLink: https://bugs.launchpad.net/bugs/1967336
>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>
> v2 - updated Focal chroot with correct dwarves package.
>
>  debian.azure-5.13/config/amd64/config.common.amd64 | 1 -
>  debian.azure-5.13/config/annotations               | 3 +++
>  debian.azure-5.13/config/arm64/config.common.arm64 | 1 -
>  debian.azure-5.13/config/config.common.ubuntu      | 2 ++
>  4 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/debian.azure-5.13/config/amd64/config.common.amd64
> b/debian.azure-5.13/config/amd64/config.common.amd64
> index 9bad458b52993..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<ENFORCED>
> note<LP:1967336>
> +
>  CONFIG_FB_EFI                                   policy<{'amd64': 'y',
> 'arm64': 'y'}>
>  CONFIG_FB_EFI                                   mark<ENFORCED>
> note<LP:1959216>
>
> diff --git a/debian.azure-5.13/config/arm64/config.common.arm64
> b/debian.azure-5.13/config/arm64/config.common.arm64
> index c7f8cd0203444..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 13d21904c42e8..19de4151f77dd 100644
> --- a/debian.azure-5.13/config/config.common.ubuntu
> +++ b/debian.azure-5.13/config/config.common.ubuntu
> @@ -2864,6 +2864,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
> @@ -7296,6 +7297,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
> --
> 2.35.1
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
diff mbox series

Patch

diff --git a/debian.azure-5.13/config/amd64/config.common.amd64 b/debian.azure-5.13/config/amd64/config.common.amd64
index 9bad458b52993..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<ENFORCED> note<LP:1967336>
+
 CONFIG_FB_EFI                                   policy<{'amd64': 'y', 'arm64': 'y'}>
 CONFIG_FB_EFI                                   mark<ENFORCED> note<LP:1959216>
 
diff --git a/debian.azure-5.13/config/arm64/config.common.arm64 b/debian.azure-5.13/config/arm64/config.common.arm64
index c7f8cd0203444..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 13d21904c42e8..19de4151f77dd 100644
--- a/debian.azure-5.13/config/config.common.ubuntu
+++ b/debian.azure-5.13/config/config.common.ubuntu
@@ -2864,6 +2864,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
@@ -7296,6 +7297,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