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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 C2B39C4CEC4 for ; Thu, 19 Sep 2019 11:31:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9938D21927 for ; Thu, 19 Sep 2019 11:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568892670; bh=LLaHVIMVAnVyIcv6P5OJ4ErPwMhqDflcAncirLoJaik=; h=Date:From:To:Cc:Subject:List-ID:From; b=mqXoeQKAPE2F/eUUpP3KXJmVNYQEM+eKXhSUXuPVugKgIcXeDl65LSGuFRwmJ2apz 8DiMIgM3Etw76nyY5AKOpfbsQFgcLW36qJRws0+bEb8bFALwGSH8f8CaMZUYrTczJu Cw5VXKu/KK7GYpUz2XKOlfReVKNOHoB/dx8up+Ls= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389887AbfISLbK (ORCPT ); Thu, 19 Sep 2019 07:31:10 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:59188 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389849AbfISLbJ (ORCPT ); Thu, 19 Sep 2019 07:31:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Content-Type:MIME-Version: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WtXZHsJGvu4bWl1ePQybzvrW/OfxAqdqaHQn3V7Ss8U=; b=pJkaZmASbMIUAxrxZG2kscwAC Yy+rCJ6GAxAL60xSAmmBGmxnzENXIpUtuDexzqb38IUcfwzoS5vjIX6eI3atYJfN7yrXSbY0lFXRN q01ZwqJeYb08eDVREhWrqPwwuyhaeLOWvA0zBYQaMG411FAGHYY5z/JxqjRPZybjBjN90=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=ypsilon.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iAueR-0002Is-7Z; Thu, 19 Sep 2019 11:31:07 +0000 Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id 448552742939; Thu, 19 Sep 2019 12:31:06 +0100 (BST) Date: Thu, 19 Sep 2019 12:31:06 +0100 From: Mark Brown To: David Sterba Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Message-ID: <20190919113106.GC3642@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="hQiwHBbRI9kgIhsi" Content-Disposition: inline X-Cookie: I'll be Grateful when they're Dead. User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --hQiwHBbRI9kgIhsi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. --hQiwHBbRI9kgIhsi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAl2DZvkACgkQJNaLcl1U h9BuHgf8D4zhKRg3HIRAc0Az3qB+CGTRrROkYlLwVXKk24lMbV6I+cjI0gQhBQ5o 4YEtdG+skW5LUHYqVH9UmRhjk7UVpaeURhqWXpMlpcEckdHkt4sPVkCW2bFJ7PHo uBKjYskRRBjaBiOmbV2+0dTpRlXp3LlZZR3jIKVp7Hh03pblYY8zcvgUM3+eaYXJ O+9J4A1GlVgeIqxEkzfeS/HrQwZOTkAY1HFb0YEn//TclR2NcxHHmuSjh3FQKFz1 VWzv0GAqMIXgHBEYKMrZHrgFLumPO9Rn9HdJ090XUWMxy3vFK+fm+Ed7tZMzxdte CNIy+Ovqi42BQMgsHxHmEAbwDjCW3Q== =kYTH -----END PGP SIGNATURE----- --hQiwHBbRI9kgIhsi--