mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Asias He <asias@redhat.com>,
	target-devel <target-devel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vhost tree with the target-updates tree
Date: Mon, 08 Jul 2013 18:13:26 -0700	[thread overview]
Message-ID: <1373332406.7397.161.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <20130708134721.8ac2d67125b60c745d46006f@canb.auug.org.au>

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


  reply	other threads:[~2013-07-09  1:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-08  3:47 Stephen Rothwell
2013-07-09  1:13 ` Nicholas A. Bellinger [this message]
2013-07-09  3:27   ` Stephen Rothwell
2013-07-09  6:12     ` Nicholas A. Bellinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373332406.7397.161.camel@haakon3.risingtidesystems.com \
    --to=nab@linux-iscsi.org \
    --cc=asias@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=sfr@canb.auug.org.au \
    --cc=target-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®