On Fri, Aug 02, 2019 at 10:07:17AM -0400, Josef Bacik wrote: > 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. > > > > Although most of the code is moving from a file to file, I fixed the > > coding style as this is the perfect opportunity to update code that does > > not change often. > > > > If you're going to send more patchsets like that, please do another pass > > after copy&paste of the code. Also note that the SPDX header in new .c > > files uses the weird // comments, unlike headers that use /* */ . > > I'm working off of next-fixes on git.kernel.org, and it looks like you have all > my patches there. Is there a different branch that I'm supposed to be working > off of? Thanks, The k.org tree should not be used for development, the branches are for interaction with other trees like linux-next or sent to Linus. The for-next is an integration branch, the development should be based off either misc-next or eg. last rc to avoid conflicts. Current misc-next contains only first 10 patches from this series, the rest I'll process next week.
