Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/target/target_core_hba.c b/drivers/target/target_core_hba.c
index 6ec51cbc018e..0b8f8da89019 100644
--- a/drivers/target/target_core_hba.c
+++ b/drivers/target/target_core_hba.c
@@ -151,19 +151,8 @@ out_free_hba:
 int
 core_delete_hba(struct se_hba *hba)
 {
-        struct se_device *dev, *dev_tmp;
-
-        spin_lock(&hba->device_lock);
-        list_for_each_entry_safe(dev, dev_tmp, &hba->hba_dev_list, dev_list) {
-
-                se_clear_dev_ports(dev);
-                spin_unlock(&hba->device_lock);
-
-                se_release_device_for_hba(dev);
-
-                spin_lock(&hba->device_lock);
-        }
-        spin_unlock(&hba->device_lock);
+        if (!list_empty(&hba->hba_dev_list))
+                dump_stack();
 
         hba->transport->detach_hba(hba);