Missing dedupe/locking patch in integration-4.2 tree?

Missing dedupe/locking patch in integration-4.2 tree?

[Holger Hoffstätte]

Mark's patch titled

  "[PATCH 3/5] btrfs: fix clone / extent-same deadlocks" [1]

from his "btrfs: dedupe fixes, features" series is missing from the integration-4.2 tree and 4.2-rc5, where it still applies cleanly (as of 5 mins ago).

Any particular reason why this was silently dropped?

-h

[1] http://www.spinics.net/lists/linux-btrfs/msg45149.html

Re: Missing dedupe/locking patch in integration-4.2 tree?

[Mark Fasheh]

On Fri, Aug 07, 2015 at 10:11:46AM +0200, Holger Hoffstätte wrote:
> 
> Mark's patch titled
> 
>   "[PATCH 3/5] btrfs: fix clone / extent-same deadlocks" [1]
> 
> from his "btrfs: dedupe fixes, features" series is missing from the integration-4.2 tree and 4.2-rc5, where it still applies cleanly (as of 5 mins ago).
> 
> Any particular reason why this was silently dropped?

Same question here, I noticed this shortly after everything went upstream
and was planning a resend but it would be great if you could tell us whether
something was wrong with the patch or if it just got lost in the shuffle (no
big deal).
	--Mark

--
Mark Fasheh

Re: Missing dedupe/locking patch in integration-4.2 tree?

[Holger Hoffstätte]

On 08/11/15 20:58, Mark Fasheh wrote:
> On Fri, Aug 07, 2015 at 10:11:46AM +0200, Holger Hoffstätte wrote:
>>
>> Mark's patch titled
>>
>>   "[PATCH 3/5] btrfs: fix clone / extent-same deadlocks" [1]
>>
>> from his "btrfs: dedupe fixes, features" series is missing from the integration-4.2 tree and 4.2-rc5, where it still applies cleanly (as of 5 mins ago).
>>
>> Any particular reason why this was silently dropped?
> 
> Same question here, I noticed this shortly after everything went upstream
> and was planning a resend but it would be great if you could tell us whether
> something was wrong with the patch or if it just got lost in the shuffle (no
> big deal).
> 	--Mark

I saw this morning that it went into integration-4.3:

https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git/commit/?h=integration-4.3&id=293a8489f300536dc6d996c35a6ebb89aa03bab2

So probably just an oversight.

-h

Re: Missing dedupe/locking patch in integration-4.2 tree?

[Mark Fasheh]

On Tue, Aug 11, 2015 at 09:42:10PM +0200, Holger Hoffstätte wrote:
> I saw this morning that it went into integration-4.3:
> 
> https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git/commit/?h=integration-4.3&id=293a8489f300536dc6d996c35a6ebb89aa03bab2
> 
> So probably just an oversight.

Ok thanks for pointing that out Holger!
	--Mark

--
Mark Fasheh