Merge back reboot/poweroff notifiers rework for 5.19-rc1.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 May 2022 12:38:29 +0000 (14:38 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 May 2022 12:38:29 +0000 (14:38 +0200)
1  2 
arch/arm64/kernel/process.c
arch/m68k/kernel/setup_mm.c
arch/x86/xen/enlighten_pv.c
drivers/acpi/sleep.c
drivers/regulator/pfuze100-regulator.c
include/linux/pm.h

Simple merge
Simple merge
@@@ -30,6 -30,8 +30,7 @@@
  #include <linux/pci.h>
  #include <linux/gfp.h>
  #include <linux/edd.h>
 -#include <linux/objtool.h>
+ #include <linux/reboot.h>
  
  #include <xen/xen.h>
  #include <xen/events.h>
Simple merge
Simple merge