On Fri, Jun 12, 2015 at 04:18:25PM -0400, Chris Mason wrote: > Hi Mark, > > This one conflicts with your btrfs: Handle unaligned length in > extent_same, which is in integration now. If we need both, can you > please rework it?
They both fix the same bug, so we just need one of them. You can keep mine in there if it's easiest or take Matt's if you like it better. Both were tested the same way on my end too. Thanks Chris. --Mark -- Mark Fasheh -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html