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

2013-07-08 Thread Nicholas A. Bellinger
On Tue, 2013-07-09 at 13:27 +1000, Stephen Rothwell wrote: > Hi Nicholas, > > On Mon, 08 Jul 2013 18:13:26 -0700 "Nicholas A. Bellinger" > wrote: > > > > On Mon, 2013-07-08 at 13:47 +1000, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the vhost tree got a conflict in > > > dri

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

2013-07-08 Thread Stephen Rothwell
Hi Nicholas, On Mon, 08 Jul 2013 18:13:26 -0700 "Nicholas A. Bellinger" wrote: > > On Mon, 2013-07-08 at 13:47 +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the vhost tree got a conflict in > > drivers/vhost/scsi.c between commit 084ed45b3846 ("vhost/scsi: Convert to > > se

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

2013-07-08 Thread Nicholas A. Bellinger
On Mon, 2013-07-08 at 13:47 +1000, Stephen Rothwell wrote: > Hi Michael, > > Today's linux-next merge of the vhost tree got a conflict in > drivers/vhost/scsi.c between commit 084ed45b3846 ("vhost/scsi: Convert to > se_cmd->cmd_kref TARGET_SCF_ACK_KREF usage") from the target-updates tree > and co

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

2013-07-07 Thread Stephen Rothwell
Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/vhost/scsi.c between commit 084ed45b3846 ("vhost/scsi: Convert to se_cmd->cmd_kref TARGET_SCF_ACK_KREF usage") from the target-updates tree and commit 3c63f66a0dcd ("vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd to