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.3 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 30885C28CBC for ; Sun, 3 May 2020 21:41:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0CD9320661 for ; Sun, 3 May 2020 21:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729112AbgECVlc (ORCPT ); Sun, 3 May 2020 17:41:32 -0400 Received: from mx2.suse.de ([195.135.220.15]:45120 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729109AbgECVlc (ORCPT ); Sun, 3 May 2020 17:41:32 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 13283AEEA; Sun, 3 May 2020 21:41:31 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 60BA3DA70B; Sun, 3 May 2020 23:40:41 +0200 (CEST) Date: Sun, 3 May 2020 23:40:41 +0200 From: David Sterba To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Filipe Manana Subject: Re: linux-next: manual merge of the btrfs tree with the btrfs-fixes tree Message-ID: <20200503214040.GR18421@suse.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , Filipe Manana References: <20200501102825.431f9cac@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200501102825.431f9cac@canb.auug.org.au> User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Fri, May 01, 2020 at 10:28:25AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the btrfs tree got a conflict in: > > fs/btrfs/tree-log.c > > between commit: > > f135cea30de5 ("btrfs: fix partial loss of prealloc extent past i_size after fsync") > > from the btrfs-fixes tree and commit: > > e94d318f12cd ("btrfs: fix partial loss of prealloc extent past i_size after fsync") Conflicts in the above commit and "btrfs: force chunk allocation if our global rsv is larger than metadata" should be gone now. Both patches have been merged to master and fresh for-next branch pushed to k.org.