Merge tag 'v5.3-rc7' into devel

Linux 5.3-rc7

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 0e28270b0fd8..aad6be5c0af0 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2204,6 +2204,12 @@ int __init acpi_scan_init(void)
         acpi_gpe_apply_masked_gpes();
         acpi_update_all_gpes();
 
+        /*
+         * Although we call __add_memory() that is documented to require the
+         * device_hotplug_lock, it is not necessary here because this is an
+         * early code when userspace or any other code path cannot trigger
+         * hotplug/hotunplug operations.
+         */
         mutex_lock(&acpi_scan_lock);
         /*
          * Enumerate devices in the ACPI namespace.