linux-kernel - Re: linux-next: manual merge of the block tree with the jc

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]

Message-ID: <20250717073209.3228adea@canb.auug.org.au>
Date: Thu, 17 Jul 2025 07:32:09 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jonathan Corbet <corbet@....net>
Cc: Jens Axboe <axboe@...nel.dk>, Bagas Sanjaya <bagasdotme@...il.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the jc_docs
 tree

Hi Jon,

On Wed, 16 Jul 2025 07:31:25 -0600 Jonathan Corbet <corbet@....net> wrote:
>
> That seems like an awful lot of fallout given that the block side, in
> its entirety, just removes a single line.  I guess the resolution is
> correct - thanks - but I don't quite understand why the conflict is so
> widespread.

Its just the "git diff" context, I guess.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped