linux-kernel - Re: [GIT PULL] Btrfs updates for 6.8

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Thu, 11 Jan 2024 16:46:15 +0100
From: David Sterba <dsterba@...e.cz>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: David Sterba <dsterba@...e.com>, linux-btrfs@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Btrfs updates for 6.8

On Wed, Jan 10, 2024 at 09:34:28AM -0800, Linus Torvalds wrote:
> On Fri, 5 Jan 2024 at 11:04, David Sterba <dsterba@...e.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/