| Message ID | 20220331172846.10229-3-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [focal/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 | 2 -- > debian.azure/config/annotations | 3 +++ > debian.azure/config/arm64/config.common.arm64 | 2 -- > debian.azure/config/config.common.ubuntu | 2 ++ > 4 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 b/debian.azure/config/amd64/config.common.amd64 > index c0212400cb546..7e106f39767a8 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/config/amd64/config.common.amd64 > @@ -364,7 +364,6 @@ CONFIG_HAMRADIO=y > CONFIG_HARDENED_USERCOPY=y > CONFIG_HFSPLUS_FS=m > CONFIG_HFS_FS=m > -CONFIG_HIBERNATION=y > CONFIG_HID=m > CONFIG_HIDRAW=y > # CONFIG_HID_A4TECH is not set > @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=18 > CONFIG_LPC_ICH=m > CONFIG_LPC_SCH=m > CONFIG_LWTUNNEL=y > -CONFIG_LZO_COMPRESS=y > CONFIG_MAC80211_DEBUGFS=y > CONFIG_MAC80211_MESH=y > CONFIG_MAC80211_MESSAGE_TRACING=y > diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations > index 79317417c4ac1..4cea85c502c5f 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_SCSI_FC_ATTRS policy<{'amd64': 'y', 'arm64': 'y'}> > CONFIG_SCSI_FC_ATTRS mark<ENFORCED> note<Azure instances have no initrd> > > diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 > index 72e667be4d88d..04f89bf4de80d 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/config/arm64/config.common.arm64 > @@ -364,7 +364,6 @@ CONFIG_GRACE_PERIOD=y > # CONFIG_HARDENED_USERCOPY is not set > # CONFIG_HFSPLUS_FS is not set > # CONFIG_HFS_FS is not set > -# CONFIG_HIBERNATION is not set > CONFIG_HID=y > # CONFIG_HIDRAW is not set > CONFIG_HID_A4TECH=y > @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=17 > # CONFIG_LPC_ICH is not set > # CONFIG_LPC_SCH is not set > # CONFIG_LWTUNNEL is not set > -CONFIG_LZO_COMPRESS=m > # CONFIG_MAC80211_DEBUGFS is not set > # CONFIG_MAC80211_MESH is not set > # CONFIG_MAC80211_MESSAGE_TRACING is not set > diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu > index f193ce0d865f5..f4bc2103fd62b 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -2539,6 +2539,7 @@ CONFIG_HI3660_MBOX=y > CONFIG_HI6220_MBOX=y > # CONFIG_HI8435 is not set > CONFIG_HIBERNATE_CALLBACKS=y > +CONFIG_HIBERNATION=y > # CONFIG_HID_ACCUTOUCH is not set > # CONFIG_HID_ACRUX is not set > # CONFIG_HID_ALPS is not set > @@ -3446,6 +3447,7 @@ CONFIG_LWTUNNEL_BPF=y > CONFIG_LZ4HC_COMPRESS=m > CONFIG_LZ4_COMPRESS=m > CONFIG_LZ4_DECOMPRESS=y > +CONFIG_LZO_COMPRESS=y > CONFIG_LZO_DECOMPRESS=y > # CONFIG_M62332 is not set > CONFIG_MAC80211=m > -- > 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 | 2 -- > debian.azure/config/annotations | 3 +++ > debian.azure/config/arm64/config.common.arm64 | 2 -- > debian.azure/config/config.common.ubuntu | 2 ++ > 4 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/debian.azure/config/amd64/config.common.amd64 > b/debian.azure/config/amd64/config.common.amd64 > index c0212400cb546..7e106f39767a8 100644 > --- a/debian.azure/config/amd64/config.common.amd64 > +++ b/debian.azure/config/amd64/config.common.amd64 > @@ -364,7 +364,6 @@ CONFIG_HAMRADIO=y > CONFIG_HARDENED_USERCOPY=y > CONFIG_HFSPLUS_FS=m > CONFIG_HFS_FS=m > -CONFIG_HIBERNATION=y > CONFIG_HID=m > CONFIG_HIDRAW=y > # CONFIG_HID_A4TECH is not set > @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=18 > CONFIG_LPC_ICH=m > CONFIG_LPC_SCH=m > CONFIG_LWTUNNEL=y > -CONFIG_LZO_COMPRESS=y > CONFIG_MAC80211_DEBUGFS=y > CONFIG_MAC80211_MESH=y > CONFIG_MAC80211_MESSAGE_TRACING=y > diff --git a/debian.azure/config/annotations > b/debian.azure/config/annotations > index 79317417c4ac1..4cea85c502c5f 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_SCSI_FC_ATTRS policy<{'amd64': 'y', > 'arm64': 'y'}> > CONFIG_SCSI_FC_ATTRS mark<ENFORCED> > note<Azure instances have no initrd> > > diff --git a/debian.azure/config/arm64/config.common.arm64 > b/debian.azure/config/arm64/config.common.arm64 > index 72e667be4d88d..04f89bf4de80d 100644 > --- a/debian.azure/config/arm64/config.common.arm64 > +++ b/debian.azure/config/arm64/config.common.arm64 > @@ -364,7 +364,6 @@ CONFIG_GRACE_PERIOD=y > # CONFIG_HARDENED_USERCOPY is not set > # CONFIG_HFSPLUS_FS is not set > # CONFIG_HFS_FS is not set > -# CONFIG_HIBERNATION is not set > CONFIG_HID=y > # CONFIG_HIDRAW is not set > CONFIG_HID_A4TECH=y > @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=17 > # CONFIG_LPC_ICH is not set > # CONFIG_LPC_SCH is not set > # CONFIG_LWTUNNEL is not set > -CONFIG_LZO_COMPRESS=m > # CONFIG_MAC80211_DEBUGFS is not set > # CONFIG_MAC80211_MESH is not set > # CONFIG_MAC80211_MESSAGE_TRACING is not set > diff --git a/debian.azure/config/config.common.ubuntu > b/debian.azure/config/config.common.ubuntu > index f193ce0d865f5..f4bc2103fd62b 100644 > --- a/debian.azure/config/config.common.ubuntu > +++ b/debian.azure/config/config.common.ubuntu > @@ -2539,6 +2539,7 @@ CONFIG_HI3660_MBOX=y > CONFIG_HI6220_MBOX=y > # CONFIG_HI8435 is not set > CONFIG_HIBERNATE_CALLBACKS=y > +CONFIG_HIBERNATION=y > # CONFIG_HID_ACCUTOUCH is not set > # CONFIG_HID_ACRUX is not set > # CONFIG_HID_ALPS is not set > @@ -3446,6 +3447,7 @@ CONFIG_LWTUNNEL_BPF=y > CONFIG_LZ4HC_COMPRESS=m > CONFIG_LZ4_COMPRESS=m > CONFIG_LZ4_DECOMPRESS=y > +CONFIG_LZO_COMPRESS=y > CONFIG_LZO_DECOMPRESS=y > # CONFIG_M62332 is not set > CONFIG_MAC80211=m > -- > 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 c0212400cb546..7e106f39767a8 100644 --- a/debian.azure/config/amd64/config.common.amd64 +++ b/debian.azure/config/amd64/config.common.amd64 @@ -364,7 +364,6 @@ CONFIG_HAMRADIO=y CONFIG_HARDENED_USERCOPY=y CONFIG_HFSPLUS_FS=m CONFIG_HFS_FS=m -CONFIG_HIBERNATION=y CONFIG_HID=m CONFIG_HIDRAW=y # CONFIG_HID_A4TECH is not set @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=18 CONFIG_LPC_ICH=m CONFIG_LPC_SCH=m CONFIG_LWTUNNEL=y -CONFIG_LZO_COMPRESS=y CONFIG_MAC80211_DEBUGFS=y CONFIG_MAC80211_MESH=y CONFIG_MAC80211_MESSAGE_TRACING=y diff --git a/debian.azure/config/annotations b/debian.azure/config/annotations index 79317417c4ac1..4cea85c502c5f 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_SCSI_FC_ATTRS policy<{'amd64': 'y', 'arm64': 'y'}> CONFIG_SCSI_FC_ATTRS mark<ENFORCED> note<Azure instances have no initrd> diff --git a/debian.azure/config/arm64/config.common.arm64 b/debian.azure/config/arm64/config.common.arm64 index 72e667be4d88d..04f89bf4de80d 100644 --- a/debian.azure/config/arm64/config.common.arm64 +++ b/debian.azure/config/arm64/config.common.arm64 @@ -364,7 +364,6 @@ CONFIG_GRACE_PERIOD=y # CONFIG_HARDENED_USERCOPY is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_HFS_FS is not set -# CONFIG_HIBERNATION is not set CONFIG_HID=y # CONFIG_HIDRAW is not set CONFIG_HID_A4TECH=y @@ -604,7 +603,6 @@ CONFIG_LOG_BUF_SHIFT=17 # CONFIG_LPC_ICH is not set # CONFIG_LPC_SCH is not set # CONFIG_LWTUNNEL is not set -CONFIG_LZO_COMPRESS=m # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_MESH is not set # CONFIG_MAC80211_MESSAGE_TRACING is not set diff --git a/debian.azure/config/config.common.ubuntu b/debian.azure/config/config.common.ubuntu index f193ce0d865f5..f4bc2103fd62b 100644 --- a/debian.azure/config/config.common.ubuntu +++ b/debian.azure/config/config.common.ubuntu @@ -2539,6 +2539,7 @@ CONFIG_HI3660_MBOX=y CONFIG_HI6220_MBOX=y # CONFIG_HI8435 is not set CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y # CONFIG_HID_ACCUTOUCH is not set # CONFIG_HID_ACRUX is not set # CONFIG_HID_ALPS is not set @@ -3446,6 +3447,7 @@ CONFIG_LWTUNNEL_BPF=y CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y +CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_M62332 is not set CONFIG_MAC80211=m
BugLink: https://bugs.launchpad.net/bugs/1967336 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- debian.azure/config/amd64/config.common.amd64 | 2 -- debian.azure/config/annotations | 3 +++ debian.azure/config/arm64/config.common.arm64 | 2 -- debian.azure/config/config.common.ubuntu | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-)