From mboxrd@z Thu Jan  1 00:00:00 1970
From: Boaz Harrosh <bharrosh@panasas.com>
Subject: Re: [GIT PULL] exofs: 3 changes to exofs & osd
Date: Tue, 18 Dec 2012 13:35:28 +0200
Message-ID: <50D05500.8040405@panasas.com>
References: <50CF4E01.5030004@panasas.com>  <1355828291.2630.21.camel@dabdike.int.hansenpartnership.com>  <50D05106.5090200@panasas.com> <1355830130.2630.23.camel@dabdike.int.hansenpartnership.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Return-path: <linux-scsi-owner@vger.kernel.org>
Received: from natasha.panasas.com ([67.152.220.90]:33652 "EHLO
	natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752924Ab2LRLfo (ORCPT
	<rfc822;linux-scsi@vger.kernel.org>); Tue, 18 Dec 2012 06:35:44 -0500
In-Reply-To: <1355830130.2630.23.camel@dabdike.int.hansenpartnership.com>
Sender: linux-scsi-owner@vger.kernel.org
List-Id: linux-scsi@vger.kernel.org
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>, open-osd <osd-dev@open-osd.org>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, linux-scsi <linux-scsi@vger.kernel.org>

On 12/18/2012 01:28 PM, James Bottomley wrote:
<>
>> Both these patches where in linux-next for a long time. So I believe
>> the merge will go just fine. Lets leave it like this, or I can rebase
>> and remove it?
> 
> If it merges OK, I'd just leave it as is.  It wouldn't be anywhere close
> to the first time we've had the same patch via different trees.
> 

Thanks James, it will not happen again. I just had a look on linux-next
of Dec 17 they both where merged in and I did not see any complains.

> James
> 
Boaz