On Fri, Aug 02, 2019 at 03:56:38PM +0200, David Sterba wrote: > On Thu, Jun 20, 2019 at 03:37:42PM -0400, Josef Bacik wrote: > > This is the series to migrate the block group code out of extent-tree.c. This > > is a much larger series than the previous two series because things were much > > more intertwined than block_rsv's and space_info. There is one code change > > patch in this series, it is > > > > btrfs: make caching_thread use btrfs_find_next_key > > I've merged 1-10 (ie. up to the patch mentioned above) as it applied > cleanly on current misc-next, the rest produced some conflicts. 11-25 is now in testing and will be in misc-next soon. I merged most of the patches manually, there were several updates (code and coding style) in the moved code. As I don't want to do that painful exercise again, patchsets like that must come last before the pull request branch is frozen. This worked well with the other code moving patchsets (3 patchsets, 23 patches in total). This one alone has about the same amount of patches, which appears to bee too much as the number of conflicts increases as other changes get merged. So the recommended approach is to do that in smaller batches and do next once the previous is merged.
