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

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

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

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

diff --cc drivers/target/tcm_fc/tfc_cmd.c
Simple merge

diff --cc drivers/target/tcm_fc/tfc_sess.c
Simple merge

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