Commit 4c2cebc89db9 for kernel

commit 4c2cebc89db9852a0815d4c3cbdea4e102230e8c
Merge: a6fa4d6e38d6 7617cc05df28
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date:   Wed Aug 26 19:14:10 2026 +0200

    Merge branch 'acpi-scan'

    Merge core ACPI device enumeration code changes for 7.3-rc1:

     - Prevent the core ACPI enumeration code from combining device
       resources that overlap completely in order to avoid resource
       conflicts during platform device registration because there are
       drivers that expect such resources to be present (Rafael Wysocki)

     - Defer device power initialization during ACPI-based device
       enumeration to the point when the given device is known to be present
       and functional and all of its dependencies have been met (Peixin Xie)

     - Fix bus ID cleanup on device_add() failures during ACPI device object
       registration (Hongyan Xu)

    * acpi-scan:
      ACPI: scan: Do not combine resources that overlap completely
      ACPI: scan: Defer device power initialization
      ACPI: scan: fix bus ID cleanup on device_add() failures

diff --cc drivers/acpi/power.c
index 23a4e207a01e,4f1479103bfe..922ba9803a93
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -954,6 -954,8 +954,7 @@@ struct acpi_device *acpi_add_power_reso
  	INIT_LIST_HEAD(&resource->list_node);
  	INIT_LIST_HEAD(&resource->dependents);
  	device->power.state = ACPI_STATE_UNKNOWN;
 -	device->flags.match_driver = true;
+ 	device->flags.initialized = true;

  	/* Evaluate the object to get the system level and resource order. */
  	status = acpi_evaluate_object(handle, NULL, NULL, &buffer);
diff --cc drivers/acpi/scan.c
index e9e374f2ad66,cd7ab27ecdce..b8a2f21dffd5
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1821,7 -1823,7 +1823,6 @@@ void acpi_init_device_object(struct acp
  	acpi_set_pnp_ids(handle, &device->pnp, type);
  	acpi_init_properties(device);
  	acpi_bus_get_flags(device);
- 	device->flags.initialized = true;
 -	device->flags.match_driver = false;
  	device->flags.enumeration_by_parent =
  		acpi_device_enumeration_by_parent(device);
  	acpi_device_clear_enumerated(device);