From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046Ab1AYBzQ (ORCPT ); Mon, 24 Jan 2011 20:55:16 -0500 Received: from mail.linux-iscsi.org ([67.23.28.174]:40334 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751504Ab1AYBzO (ORCPT ); Mon, 24 Jan 2011 20:55:14 -0500 Subject: Re: [GIT PULL for 38-rc3] target updates for v4.0.0-rc7 From: "Nicholas A. Bellinger" To: James Bottomley Cc: Andrew Morton , Linus Torvalds , Christoph Hellwig , Mike Christie , FUJITA Tomonori , Stephen Rothwell , linux-scsi , LKML In-Reply-To: <1295919523.15425.104.camel@mulgrave.site> References: <1295914455.24778.115.camel@haakon2.linux-iscsi.org> <1295915790.15425.44.camel@mulgrave.site> <1295918871.24778.161.camel@haakon2.linux-iscsi.org> <1295919523.15425.104.camel@mulgrave.site> Content-Type: text/plain Date: Mon, 24 Jan 2011 17:55:09 -0800 Message-Id: <1295920509.24778.172.camel@haakon2.linux-iscsi.org> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2011-01-24 at 19:38 -0600, James Bottomley wrote: > On Mon, 2011-01-24 at 17:27 -0800, Nicholas A. Bellinger wrote: > > On Mon, 2011-01-24 at 18:36 -0600, James Bottomley wrote: > > > On Mon, 2011-01-24 at 16:14 -0800, Nicholas A. Bellinger wrote: > > > > Hi James and Co, > > > > > > > > Here are the latest v4.0.0-rc7 updates for mainline drivers/target/ code > > > > rebased against linux-2.6.git -> .38-rc2. These individual patches have > > > > been reviewed on linux-scsi and commited into the upstream LIO kernel > > > > tree, so please consider pulling for .38-rc3: > > > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-38-rc3 > > > > > > > > Also at this point, having Linus pull directly from > > > > scsi-post-merge-2.6.git/for-38-rcX for mainline target bugfixes + > > > > improvements may make more sense. > > > > > > > > Linus/Andrew/James, please let me know which you prefer here. > > > > > > Right at the moment, I'm trying to encourage a few people with > > > established areas to experiment with their own git trees in SCSI, but > > > the target subsystem, being a newcomer, wouldn't be one of these, so, > > > for the time being, patch series over linux-scsi please for review and > > > feedback. > > > > > > > Sure, thanks for the clarification. The same set of patches are > > available against your .37-FINAL based scsi-post-merge-2.6.git/master > > HEAD here: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6.git for-jejb > > > > Please let me know if you have any further questions, > > Over the list, please, not in a git tree. What I need is for others to > review them ... and appearing on the list best encourages that. > Yes, but to clarify one item. All of these patches in for-38-rc3 and for-jejb branches have already been sent out to linux-scsi incrementally when they where committed into LIO upstream code. Are you asking that the entire patch series be re-sent to linux-scsi against .38-rc2..? > It's also better to use something more stable as the base, like linus > head or scsi-misc as the base. The postmerge tree is my most volatile > tree (fairly constantly rebasing as I try to get the merge fixes > right) ... and it's currently defunct until another merge clash appears. > > By way of demonstration, try pulling your current postmerge tree into > linus head and see what happens (the resulting conflicts are because of > the rebases). Yes sorry, I should have been more specific here wrt to my scsi-post-merge-2.6.git branches: *) for-38-rc3: rebased to linus .38-rc2 tag *) for-jejb: based on jejb scsi-post-merge-2.6.git/master @ .37-FINAL from commit 7d2087a1820b (initial LIO target core v4.0.0-rc6 commit) Both are now in sync with the upstream LIO tree v4.0.0-rc7 bugfixes, and I have been keeping 'for-jejb' as convience for you against your initial target merge. --nab