From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbaFMSJi (ORCPT ); Fri, 13 Jun 2014 14:09:38 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:46290 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752021AbaFMSJh (ORCPT ); Fri, 13 Jun 2014 14:09:37 -0400 Message-ID: <1402682975.16525.19.camel@haakon3.risingtidesystems.com> Subject: Re: [GIT PULL] target updates for v3.16-rc1 From: "Nicholas A. Bellinger" To: Christoph Hellwig Cc: Linus Torvalds , target-devel , linux-scsi , LKML , Stephen Rothwell , Paolo Bonzini , Quinn Tran , "Michael S. Tsirkin" , Rusty Russell Date: Fri, 13 Jun 2014 11:09:35 -0700 In-Reply-To: <1402682868.16525.18.camel@haakon3.risingtidesystems.com> References: <1402607116.18202.46.camel@haakon3.risingtidesystems.com> <20140613133901.GC7371@lst.de> <1402682868.16525.18.camel@haakon3.risingtidesystems.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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