Messages in this thread | | | Subject | Re: linux-next: manual merge of the vhost tree with the target-updates tree | From | "Nicholas A. Bellinger" <> | Date | Mon, 08 Jul 2013 18:13:26 -0700 |
| |
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 commit 3c63f66a0dcd ("vhost-scsi: Rename struct tcm_vhost_cmd *tv_cmd > to *cmd") from the vhost tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). >
Hi Stephen,
Can you briefly refresh my memory how the process of 'carrying the fix' in linux-next should work..?
So once I send a -rc1 PULL request to Linus over the next days, and MST sends one shortly there-after and hits a conflict, you'll include this patch in a separate next-fixes branch for Linus to PULL..?
--nab
| |