From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1752709AbZK2OXE@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752709AbZK2OXE (ORCPT <rfc822;w@1wt.eu>);
	Sun, 29 Nov 2009 09:23:04 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752101AbZK2OXD
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sun, 29 Nov 2009 09:23:03 -0500
Received: from daytona.panasas.com ([67.152.220.89]:2955 "EHLO
	daytona.int.panasas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751622AbZK2OXC (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 29 Nov 2009 09:23:02 -0500
Message-ID: <4B1283C9.1030002@panasas.com>
Date: Sun, 29 Nov 2009 16:23:05 +0200
From: Boaz Harrosh <bharrosh@panasas.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091125 Remi/fc10 Thunderbird/3.0
MIME-Version: 1.0
To: James Bottomley <James.Bottomley@HansenPartnership.com>
CC: open-osd <osd-dev@open-osd.org>, Stephen Rothwell <sfr@canb.auug.org.au>,
       linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
       linux-scsi <linux-scsi@vger.kernel.org>
Subject: Re: linux-next: manual merge of the osd tree with the scsi tree
References: <20091127143229.108298c6.sfr@canb.auug.org.au>	 <4B123A82.10104@panasas.com>  <4B127202.1010900@panasas.com> <1259502399.2827.14.camel@mulgrave.site>
In-Reply-To: <1259502399.2827.14.camel@mulgrave.site>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-OriginalArrivalTime: 29 Nov 2009 14:23:07.0849 (UTC) FILETIME=[78C2E390:01CA70FF]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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


> Thanks,
> 
> James
> 
> 

Boaz