On Mon, Jul 11, 2016 at 11:05:29AM +0800, Qu Wenruo wrote: > From: Wang Xiaoguang <wangxg.fnst@xxxxxxxxxxxxxx> > > Extract cow_file_range() new parameters for both in-band dedupe and > subpage sector size patchset. > > This should make conflict of both patchset to minimal, and reduce the > effort needed to rebase them. Great, thanks. I did a test merge, there are still conflicts but they seem to be resolvable more easily, picking the changes from the right patchset. I haven't tested it so there's more work, but the point was to get the conflict surface down. There's another candidate, btrfs_set_extent_delalloc as it adds a parameter, can you please send a similar patch for that? -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
