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] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHk-=wgPpNkBikDhCVOciA_bs9SkHH7XakdT0DbknFyiR_4HTw@mail.gmail.com>
Date: Sat, 18 May 2024 14:19:15 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: "Theodore Ts'o" <tytso@....edu>
Cc: Ext4 Developers List <linux-ext4@...r.kernel.org>, 
	Linux Kernel Developers List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] ext4 updates for v6.10-rc1

On Fri, 17 May 2024 at 21:46, Theodore Ts'o <tytso@....edu> wrote:
>
> Note that there is a relatively merge conflict; the relatively simple
> resolution which I used when running regression tests is at the tag
> ext4_merge_resolution in the ext4 git repo,

Heh. That tag just points to the same commit you asked me to pull. I
think you may have tagged it before you actually committed your merge
resolution.

That said, the merge resolution looks trivial, so no big deal. When
people send me a suggested merge, I usually compare against it just
because it's cheap insurance, not because it's usually necessary.

But you may want to check that I actually did the same thing you did.

             Linus

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ