Merge branch 'acpi-bus'

Merge ACPI bus type driver updates for 6.7-rc1:

 - Add context argument to acpi_dev_install_notify_handler() (Rafael
   Wysocki).

 - Clarify ACPI bus concepts in the ACPI device enumeration
   documentation (Rafael Wysocki).

* acpi-bus:
  ACPI: bus: Add context argument to acpi_dev_install_notify_handler()
  ACPI: docs: enumeration: Clarify ACPI bus concepts

diff --cc drivers/acpi/bus.c
Simple merge

diff --cc drivers/acpi/nfit/core.c
index 7d88db451cfbfe17c5f8196fa90c5af3d5cc594e,942b84d94078ac489e3850fc6cc2e6e966b466af..9923855377570c194b4e80cf7878782597588edd
--- 1/drivers/acpi/nfit/core.c
--- 2/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@@ -3339,16 -3339,6 +3339,16 @@@ static int acpi_nfit_add(struct acpi_de
        acpi_size sz;
        int rc = 0;
  
-                                            acpi_nfit_notify);
 +      rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
++                                           acpi_nfit_notify, adev);
 +      if (rc)
 +              return rc;
 +
 +      rc = devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler,
 +                                      adev);
 +      if (rc)
 +              return rc;
 +
        status = acpi_get_table(ACPI_SIG_NFIT, 0, &tbl);
        if (ACPI_FAILURE(status)) {
                /* The NVDIMM root device allows OS to trigger enumeration of

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge