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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 3A7B8C3A5A6 for ; Mon, 23 Sep 2019 11:59:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1BB2C205F4 for ; Mon, 23 Sep 2019 11:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730582AbfIWL7W (ORCPT ); Mon, 23 Sep 2019 07:59:22 -0400 Received: from mx2.suse.de ([195.135.220.15]:33436 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728928AbfIWL7W (ORCPT ); Mon, 23 Sep 2019 07:59:22 -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 A4759AEAE; Mon, 23 Sep 2019 11:59:20 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id E5E90DA7DA; Mon, 23 Sep 2019 13:59:38 +0200 (CEST) Date: Mon, 23 Sep 2019 13:59:38 +0200 From: David Sterba To: Mark Brown Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Message-ID: <20190923115938.GR2850@suse.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Mark Brown , Linux Next Mailing List , Linux Kernel Mailing List References: <20190919113106.GC3642@sirena.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190919113106.GC3642@sirena.co.uk> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 19, 2019 at 12:31:06PM +0100, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the btrfs-kdave tree got conflicts in: > > fs/btrfs/block-group.c > fs/btrfs/ctree.h > fs/btrfs/extent-tree.c > fs/btrfs/send.c > fs/btrfs/space-info.c > include/uapi/linux/btrfs_tree.h > > between a number of commits in Linus' tree and a number of commits in > the btrfs-kdave tree. I don't feel comfortable that I can resolve these > safely and the btrfs-kdave tree hasn't changed since August with the > last non-merge commit in June so I've dropped the tree for today. Dropping the tree temporarily is ok. I'm going to refresh the source branch today so it should be in a good shape for next linux-next snapshot.