From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60606C32750 for ; Fri, 2 Aug 2019 18:05:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40FB120665 for ; Fri, 2 Aug 2019 18:05:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405450AbfHBSFS (ORCPT ); Fri, 2 Aug 2019 14:05:18 -0400 Received: from mx2.suse.de ([195.135.220.15]:48746 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731545AbfHBSFS (ORCPT ); Fri, 2 Aug 2019 14:05:18 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 51E3CAE20; Fri, 2 Aug 2019 18:05:16 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id BD7FBDADC0; Fri, 2 Aug 2019 20:05:49 +0200 (CEST) Date: Fri, 2 Aug 2019 20:05:49 +0200 From: David Sterba To: Josef Bacik Cc: linux-btrfs@vger.kernel.org Subject: Re: [PATCH 00/25] btrfs: migrate the block group code Message-ID: <20190802180549.GY28208@suse.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Josef Bacik , linux-btrfs@vger.kernel.org References: <20190620193807.29311-1-josef@toxicpanda.com> <20190802135638.GW28208@twin.jikos.cz> <20190802140716.zmyytedvuzwq6gbn@MacBook-Pro-91.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190802140716.zmyytedvuzwq6gbn@MacBook-Pro-91.local> User-Agent: Mutt/1.5.23.1 (2014-03-12) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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.