From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Jens Axboe <axboe@kernel.dk>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the jc_docs tree
Date: Thu, 17 Jul 2025 07:32:09 +1000 [thread overview]
Message-ID: <20250717073209.3228adea@canb.auug.org.au> (raw)
In-Reply-To: <87ecugdzyq.fsf@trenco.lwn.net>
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
Hi Jon,
On Wed, 16 Jul 2025 07:31:25 -0600 Jonathan Corbet <corbet@lwn.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-07-16 21:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-16 5:02 linux-next: manual merge of the block tree with the jc_docs tree Stephen Rothwell
2025-07-16 6:12 ` Bagas Sanjaya
2025-07-16 13:31 ` Jonathan Corbet
2025-07-16 21:32 ` Stephen Rothwell [this message]
2025-07-29 1:46 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-25 4:42 Stephen Rothwell
2019-07-09 0:08 ` Stephen Rothwell
2019-07-09 2:45 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250717073209.3228adea@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox