Received-SPF: pass (google.com: domain of linux-kernel+bounces-23811-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Thu, 11 Jan 2024 16:46:15 +0100
From: David Sterba <dsterba@suse.cz>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Sterba <dsterba@suse.com>, linux-btrfs@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Btrfs updates for 6.8
Message-ID: <20240111154615.GF31555@twin.jikos.cz>
Reply-To: dsterba@suse.cz
References: <cover.1704481157.git.dsterba@suse.com>
 <CAHk-=wjju0S87C+pdF=0i0hVky+HeMj1xVFwUdV867YoLheL5Q@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAHk-=wjju0S87C+pdF=0i0hVky+HeMj1xVFwUdV867YoLheL5Q@mail.gmail.com>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)

On Wed, Jan 10, 2024 at 09:34:28AM -0800, Linus Torvalds wrote:
> On Fri, 5 Jan 2024 at 11:04, David Sterba <dsterba@suse.com> wrote:
> >
> > There are possible minor merge conflicts reported by linux-next.
> 
> Bah. The block open mode changes were ugly. I did my best to make the
> end result legible.
> 
> You may want to note the btrfs_open_mode() helper I added and possibly
> do it differently.

Thanks, 1200+ lines of the merge diff certainly did not make it easy.
My local tests passed and the conflict resolution seem to do the
right thing. Josef sent a different fixup [1] altough it seems he
based it on the master branch without your resolution, but the logic
looks equivalent.

[1] https://lore.kernel.org/linux-btrfs/2fe68e18d89abb7313392c8da61aaa9881bbe945.1704917721.git.josef@toxicpanda.com/