From: James Bottomley Subject: Re: linux-next: manual merge of the osd tree with the scsi tree Date: Sun, 29 Nov 2009 10:23:35 -0500 Message-ID: <1259508215.2827.15.camel@mulgrave.site> References: <20091127143229.108298c6.sfr@canb.auug.org.au> <4B123A82.10104@panasas.com> <4B127202.1010900@panasas.com> <1259502399.2827.14.camel@mulgrave.site> <4B1283C9.1030002@panasas.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4B1283C9.1030002@panasas.com> Sender: linux-next-owner@vger.kernel.org To: Boaz Harrosh Cc: open-osd , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-scsi List-Id: linux-scsi@vger.kernel.org On Sun, 2009-11-29 at 16:23 +0200, Boaz Harrosh wrote: > On 11/29/2009 03:46 PM, James Bottomley wrote: > >> > >> Should I repost the correct two patches (my preference)? should I send in a fix to > >> current scsi-misc tree? or should I send two SQUASH-ME patches to the two bad commits > >> in your tree? > >> > >> How do you want to proceed? > > > > Send me the replacement patch (and tell me which commit id in my tree > > it's replacing). > > > > Thank you James. > > I'm posting two patches as reply to this mail. > > [PATCH 1/2] osduld: Use device->release instead of internal kref > which replaces: > f89b9ee [SCSI] osduld: Use device->release instead of internal kref > > and > > [PATCH 2/2] libosd: osd_dev_info: Unique Identification of an OSD device > which replaces: > 3b616d4 [SCSI] libosd: osd_dev_info: Unique Identification of an OSD device OK, replacement should be done in scsi-misc (give an hour or two for mirror updates). James