Merge remote-tracking branch 'target-updates/for-next'

Conflicts:
	drivers/target/target_core_tpg.c

diff --cc drivers/target/target_core_device.c
Simple merge

diff --cc drivers/target/target_core_iblock.c
Simple merge

diff --cc drivers/target/target_core_tpg.c
index 2a573de19a9fdceea07d233f15a699be6c10c770,d1df39a05d885edaa46c1ba3d0e1742299913ae5..c036595b17cfc9cfc75f9bd57d146bfb4179d67b
--- 1/drivers/target/target_core_tpg.c
--- 2/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@@ -656,9 -658,15 +656,9 @@@ static int core_tpg_setup_virtual_lun0(
        spin_lock_init(&lun->lun_sep_lock);
        init_completion(&lun->lun_ref_comp);
  
-       ret = core_tpg_post_addlun(se_tpg, lun, lun_access, dev);
 -      ret = percpu_ref_init(&lun->lun_ref, core_tpg_lun_ref_release);
 -      if (ret < 0)
 -              return ret;
 -
+       ret = core_tpg_add_lun(se_tpg, lun, lun_access, dev);
 -      if (ret < 0) {
 -              percpu_ref_cancel_init(&lun->lun_ref);
 +      if (ret < 0)
                return ret;
 -      }
  
        return 0;
  }

diff --cc include/target/target_core_base.h
Simple merge