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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 786B1C433FE for ; Thu, 7 Apr 2022 05:53:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238417AbiDGFzs (ORCPT ); Thu, 7 Apr 2022 01:55:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234606AbiDGFzr (ORCPT ); Thu, 7 Apr 2022 01:55:47 -0400 Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BE94FD36; Wed, 6 Apr 2022 22:53:47 -0700 (PDT) Received: by verein.lst.de (Postfix, from userid 2407) id 9D51A68AFE; Thu, 7 Apr 2022 07:53:43 +0200 (CEST) Date: Thu, 7 Apr 2022 07:53:43 +0200 From: Christoph Hellwig To: dsterba@suse.cz, Christoph Hellwig , Josef Bacik , David Sterba , Qu Wenruo , Naohiro Aota , linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: Re: cleanup btrfs bio handling, part 1 Message-ID: <20220407055343.GA13812@lst.de> References: <20220404044528.71167-1-hch@lst.de> <20220405145626.GY15609@twin.jikos.cz> <20220405150956.GA16714@lst.de> <20220406180023.GC15609@twin.jikos.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220406180023.GC15609@twin.jikos.cz> User-Agent: Mutt/1.5.17 (2007-11-01) Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Wed, Apr 06, 2022 at 08:00:24PM +0200, David Sterba wrote: > I was able to resolve all the merge conflicts either manually or using > the tool wiggle, no need to rebase. No problem. What branch should I use as baseline? for-next seems to be merged from not otherwise visible branches so I'm not sure that is a good baseline.