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

[Stephen Rothwell]

Hi Jon,

On Wed, 16 Jul 2025 07:31:25 -0600 Jonathan Corbet <corbet@xxxxxxx> 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

Attachment: pgpIxuRnRKYO2.pgp
Description: OpenPGP digital signature