Re: linux-next: manual merge of the target-updates tree with Linus' tree

Hi Stephen, On Mon, 2015-06-01 at 20:48 +1000, Stephen Rothwell wrote: > Hi Nicholas, > > Today's linux-next merge of the target-updates tree got a conflict in > drivers/target/target_core_configfs.c between commit d588cf8f618d > ("target: Fix se_tpg_tfo->tf_subsys regression + remove

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_user.c between commit 9c1cd1b68cd1 ("target/user: Only support full command pass-through") from Linus' tree and commit 1f44c7e00856 ("target: simplify backend driver registration") and

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit a3541703ebbf ("target: Use a PASSTHROUGH flag instead of transport_types") from Linus' tree and commit 50c44f9b1587 ("target: Add support for fabric IRQ

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_pr.c between commit d588cf8f618d (target: Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem"") from Linus' tree and commits c6eec4d58f5d ("target: remove tf_subsystem pointers")

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_device.c between commit a3541703ebbf ("target: Use a PASSTHROUGH flag instead of transport_types") from Linus' tree and commit 1362adc724c4 ("target: Subsume se_port +

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_configfs.c between commit d588cf8f618d ("target: Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem") from Linus' tree and commits c6eec4d58f5d ("target: remove tf_subsystem

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit a3541703ebbf (target: Use a PASSTHROUGH flag instead of transport_types) from Linus' tree and commit 50c44f9b1587 (target: Add support for fabric IRQ

Re: linux-next: manual merge of the target-updates tree with Linus' tree

Hi Stephen, On Mon, 2015-06-01 at 20:48 +1000, Stephen Rothwell wrote: Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_configfs.c between commit d588cf8f618d (target: Fix se_tpg_tfo-tf_subsys regression + remove tf_subsystem)

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_pr.c between commit d588cf8f618d (target: Fix se_tpg_tfo-tf_subsys regression + remove tf_subsystem) from Linus' tree and commits c6eec4d58f5d (target: remove tf_subsystem pointers) and

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_user.c between commit 9c1cd1b68cd1 (target/user: Only support full command pass-through) from Linus' tree and commit 1f44c7e00856 (target: simplify backend driver registration) and

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_device.c between commit a3541703ebbf (target: Use a PASSTHROUGH flag instead of transport_types) from Linus' tree and commit 1362adc724c4 (target: Subsume se_port +

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_configfs.c between commit d588cf8f618d (target: Fix se_tpg_tfo-tf_subsys regression + remove tf_subsystem) from Linus' tree and commits c6eec4d58f5d (target: remove tf_subsystem pointers)

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/vhost/scsi.c between commit 46243860806b ("vhost-scsi: Add missing virtio-scsi -> TCM attribute conversion") from Linus' tree and commit 2936f1d4f3e8 ("vhost/scsi: Global tcm_vhost -> vhost_scsi rename")

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/vhost/scsi.c between commit 46243860806b (vhost-scsi: Add missing virtio-scsi - TCM attribute conversion) from Linus' tree and commit 2936f1d4f3e8 (vhost/scsi: Global tcm_vhost - vhost_scsi rename) from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/vhost/scsi.c between commit 46243860806b ("vhost-scsi: Add missing virtio-scsi -> TCM attribute conversion") from Linus' tree and commit 6df22d68ecaf ("vhost/scsi: Add ANY_LAYOUT prerequisites") from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/vhost/scsi.c between commit 46243860806b (vhost-scsi: Add missing virtio-scsi - TCM attribute conversion) from Linus' tree and commit 6df22d68ecaf (vhost/scsi: Add ANY_LAYOUT prerequisites) from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_tpg.c between commit de06875f0896 ("target: Remove extra percpu_ref_init") from Linus' tree and commit d344f8a15637 ("target: Rename core_tpg_{pre,post}_addlun for clarity") from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_tpg.c between commit de06875f0896 (target: Remove extra percpu_ref_init) from Linus' tree and commit d344f8a15637 (target: Rename core_tpg_{pre,post}_addlun for clarity) from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in lib/percpu-refcount.c between commit 5e9dd373dea4 ("percpu_refcount: export symbols") from Linus' tree and commit c9e8d128fe31 ("percpu-refcount: Add EXPORT_SYMBOL to use percpu_ref from modules") from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in lib/percpu-refcount.c between commit 5e9dd373dea4 (percpu_refcount: export symbols) from Linus' tree and commit c9e8d128fe31 (percpu-refcount: Add EXPORT_SYMBOL to use percpu_ref from modules) from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit 3ea160b3e8f0 ("target: Fix handling of aborted commands") from Linus' tree and commit 019c4ca62148 ("target: kill dev->dev_task_attr_type") from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit 3ea160b3e8f0 (target: Fix handling of aborted commands) from Linus' tree and commit 019c4ca62148 (target: kill dev-dev_task_attr_type) from the target-updates

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit 6138ed2ab879 ("target: move transport_get_sense_data") from Linus' tree and commit 867c8e7dae31 ("target: Simplify fabric sense data length handling") from the

linux-next: manual merge of the target-updates tree with Linus' tree

Hi Nicholas, Today's linux-next merge of the target-updates tree got a conflict in drivers/target/target_core_transport.c between commit 6138ed2ab879 (target: move transport_get_sense_data) from Linus' tree and commit 867c8e7dae31 (target: Simplify fabric sense data length handling) from the