| Message ID | 20220331172846.10229-4-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [impish/linux-azure] UBUNTU: [Config] Azure: arm64 CONFIG_HIBERNATION=y | expand |
Acked-by: Bartlomiej Zolnierkiewicz <bartlomiej.zolnierkiewicz@canonical.com> On Thu, Mar 31, 2022 at 7:29 PM Tim Gardner <tim.gardner@canonical.com> wrote: > > BugLink: https://bugs.launchpad.net/bugs/1967336 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.azure/config/amd64/config.common.amd64 | 1 - > debian.azure/config/annotations | 3 +++ > debian.azure/config/arm64/config.common.arm64 | 1 - > debian.azure/config/config.common.ubuntu | 2 ++ > 4 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 > index 82c8f7a39a7c..3b9c14044468 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/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/config/annotations b/debian.azure/config/annotations > index 4a2a1cd9b69e..bbc994964837 100644 > --- a/debian.azure/config/annotations > +++ b/debian.azure/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/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 > index 787ff0420064..d0cac58a9717 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/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/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu > index 8c689397d16b..a3bf88d3084e 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -2849,6 +2849,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 > @@ -7282,6 +7283,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
Acked-By: Philip Cox <philip.cox@canonical.com> On Thu, Mar 31, 2022 at 1:29 PM Tim Gardner <tim.gardner@canonical.com> wrote: > BugLink: https://bugs.launchpad.net/bugs/1967336 > > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > debian.azure/config/amd64/config.common.amd64 | 1 - > debian.azure/config/annotations | 3 +++ > debian.azure/config/arm64/config.common.arm64 | 1 - > debian.azure/config/config.common.ubuntu | 2 ++ > 4 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 > b/debian.azure/config/amd64/config.common.amd64 > index 82c8f7a39a7c..3b9c14044468 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/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/config/annotations > b/debian.azure/config/annotations > index 4a2a1cd9b69e..bbc994964837 100644 > --- a/debian.azure/config/annotations > +++ b/debian.azure/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/config/arm64/config.common.arm64 > b/debian.azure/config/arm64/config.common.arm64 > index 787ff0420064..d0cac58a9717 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/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/config/config.common.ubuntu > b/debian.azure/config/config.common.ubuntu > index 8c689397d16b..a3bf88d3084e 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -2849,6 +2849,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 > @@ -7282,6 +7283,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 --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 index 82c8f7a39a7c..3b9c14044468 100644 --- a/debian.azure/config/amd64/config.common.amd64 +++ b/debian.azure/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/config/annotations b/debian.azure/config/annotations index 4a2a1cd9b69e..bbc994964837 100644 --- a/debian.azure/config/annotations +++ b/debian.azure/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/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 index 787ff0420064..d0cac58a9717 100644 --- a/debian.azure/config/arm64/config.common.arm64 +++ b/debian.azure/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/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index 8c689397d16b..a3bf88d3084e 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -2849,6 +2849,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 @@ -7282,6 +7283,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
BugLink: https://bugs.launchpad.net/bugs/1967336 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.azure/config/amd64/config.common.amd64 | 1 - debian.azure/config/annotations | 3 +++ debian.azure/config/arm64/config.common.arm64 | 1 - debian.azure/config/config.common.ubuntu | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-)