From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
target-devel <target-devel@vger.kernel.org>,
linux-scsi <linux-scsi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Paolo Bonzini <pbonzini@redhat.com>,
Quinn Tran <quinn.tran@qlogic.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>
Subject: Re: [GIT PULL] target updates for v3.16-rc1
Date: Fri, 13 Jun 2014 11:09:35 -0700 [thread overview]
Message-ID: <1402682975.16525.19.camel@haakon3.risingtidesystems.com> (raw)
In-Reply-To: <1402682868.16525.18.camel@haakon3.risingtidesystems.com>
On Fri, 2014-06-13 at 11:07 -0700, Nicholas A. Bellinger wrote:
> On Fri, 2014-06-13 at 15:39 +0200, Christoph Hellwig wrote:
> > On Thu, Jun 12, 2014 at 02:05:16PM -0700, Nicholas A. Bellinger wrote:
> > > The first is with virtio-scsi between what has been merged in scsi.git
> > > for "virtio_scsi: use cmd_size", and the "virtio-scsi: Enable DIF/DIX
> > > modes in SCSI host LLD" below. (Adding Paolo + hch CC')
> >
> > Just curious, why did we decide to take the virtio-scsi patches
> > through the target tree? Seems like taking them through the scsi
> > tree would have been a lot simpler.
> >
>
> It's a matter of keeping changes together so they could be run from a
> single branch, without having to merge the entirety of scsi.git in order
> to test a new target features involving some manner of LLD changes.
>
> Stuff like the qla2xxx target T10 PI where OK to go through scsi.git,
> because they really didn't depend on target changes, but for things like
> virtio-scsi + vhost-scsi T10 PI, or the iser-initiator + iser-target T10
> PI data_length changes where one can't function without the other,
> breaking up initiator / target patches across trees will just end up
> making my work-flow unnecessarily more difficult.
>
> I'd say identifying these types of merge conflicts is what linux-next is
> supposed to be for, and at least this time around the conflicts ended up
> being straight-forward to resolve with srf's patches.
>
... with SFR's patches, of course. ;)
--nab
prev parent reply other threads:[~2014-06-13 18:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 21:05 [GIT PULL] target updates for v3.16-rc1 Nicholas A. Bellinger
2014-06-13 13:39 ` Christoph Hellwig
2014-06-13 15:21 ` James Bottomley
2014-06-13 16:41 ` Christoph Hellwig
2014-06-13 17:04 ` James Bottomley
2014-06-13 17:19 ` Christoph Hellwig
2014-06-13 18:07 ` Nicholas A. Bellinger
2014-06-13 18:09 ` Nicholas A. Bellinger [this message]
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=1402682975.16525.19.camel@haakon3.risingtidesystems.com \
--to=nab@linux-iscsi.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=quinn.tran@qlogic.com \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=target-devel@vger.kernel.org \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.