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

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_nego.c
Simple merge

diff --cc drivers/usb/gadget/tcm_usb_gadget.c
Simple merge

diff --cc drivers/vhost/scsi.c
Simple merge