Merge branch 'fixes' into 'for-next'

Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.

diff --cc drivers/platform/x86/amd/pmc/pmc.c
Simple merge

diff --cc drivers/platform/x86/asus-nb-wmi.c
Simple merge

diff --cc drivers/platform/x86/asus-wmi.c
Simple merge

diff --cc drivers/platform/x86/dell/alienware-wmi.c
index 63cf016bc9128125b32f14b8cf63fa8bf39cfbb1,341d01d3e3e4c7e15e99594da03f649efb7d56a7..e252e0cf47efee234c457fb44d64289cce26c10b
--- 1/drivers/platform/x86/dell/alienware-wmi.c
--- 2/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@@ -689,7 -694,20 +698,10 @@@ static int alienware_zone_init(struct p
  
  static void alienware_zone_exit(struct platform_device *dev)
  {
 -      u8 zone;
 -
+       if (!quirks->num_zones)
+               return;
+ 
 -      sysfs_remove_group(&dev->dev.kobj, &zone_attribute_group);
        led_classdev_unregister(&global_led);
 -      if (zone_dev_attrs) {
 -              for (zone = 0; zone < quirks->num_zones; zone++)
 -                      kfree(zone_dev_attrs[zone].attr.name);
 -      }
 -      kfree(zone_dev_attrs);
 -      kfree(zone_data);
 -      kfree(zone_attrs);
  }
  
  static acpi_status alienware_wmax_command(void *in_args, size_t in_size,

diff --cc drivers/platform/x86/dell/dell-uart-backlight.c
Simple merge

diff --cc drivers/platform/x86/hp/hp-wmi.c
index ee3a915dd6cefdcb09e702ce889715327c626fc6,20c55bab3b8cc053e1230a6646ed3eb70b7c997b..db5fdee2109cef506f03c78c3f1a311837a470a1
--- 1/drivers/platform/x86/hp/hp-wmi.c
--- 2/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@@ -84,10 -80,10 +84,10 @@@ static const char * const omen_thermal_
   * "balanced" when reaching zero.
   */
  static const char * const omen_timed_thermal_profile_boards[] = {
-       "8BAD", "8A42"
+       "8BAD", "8A42", "8A15"
  };
  
 -/* DMI Board names of Victus laptops */
 +/* DMI Board names of Victus 16-d1xxx laptops */
  static const char * const victus_thermal_profile_boards[] = {
        "8A25"
  };

diff --cc drivers/platform/x86/intel/pmc/core_ssram.c
Simple merge

diff --cc drivers/platform/x86/intel/tpmi_power_domains.c
Simple merge

diff --cc drivers/platform/x86/intel/vsec.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge