lp:~canonical-kernel/ubuntu/+source/linux-aws/+git/impish

Author: David Woodhouse
Author Date: 2022-03-19 16:11:00 UTC

PM: hibernate: Honour ACPI hardware signature by default for virtual guests

BugLink: https://bugs.launchpad.net/bugs/1965002

The ACPI specification says that OSPM should refuse to restore from
hibernate if the hardware signature changes, and should boot from
scratch. However, real BIOSes often vary the hardware signature in cases
where we *do* want to resume from hibernate, so Linux doesn't follow the
spec by default.

However, in a virtual environment there's no reason for the VMM to vary
the hardware signature *unless* it wants to trigger a clean reboot as
defined by the ACPI spec. So enable the check by default if a hypervisor
is detected.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit f6c46b1d62f8ffbf2cf6eb43ab0d277bd3f7e948 linux-next)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Ian May <ian.may@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Author: Andra Paraschiv
Author Date: 2021-08-27 15:49:30 UTC

nitro_enclaves: Add fixes for checkpatch blank line reports

BugLink: https://bugs.launchpad.net/bugs/1951873

Remove blank lines that are not necessary, fixing the checkpatch script
reports. While at it, add a blank line after the switch default block,
similar to the other parts of the codebase.

Reviewed-by: George-Aurelian Popescu <popegeo@amazon.com>
Signed-off-by: Andra Paraschiv <andraprs@amazon.com>
Link: https://lore.kernel.org/r/20210827154930.40608-8-andraprs@amazon.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit da1c396a81b87541cf7a7c2c6e128b722461a1c8)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>