From: Jens Axboe <axboe@kernel.dk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Subject: Re: [GIT PULL] Block updates for 7.4-rc
Date: Sat, 24 Oct 2026 21:09:21 -0600 [thread overview]
Message-ID: <9e552c09-f0df-4123-9fee-60541177a986@kernel.dk> (raw)
In-Reply-To: <CAHk-=whdThHmhxSuh2dWw8-+v5caYBdb3AwLyx4YY67_P0qufQ@mail.gmail.com>
On 10/24/26 6:18 PM, Linus Torvalds wrote:
> On Wed, 21 Oct 2026 at 05:11, Jens Axboe <axboe@kernel.dk> wrote:
>>
>> On 10/21/26 8:43 AM, Jens Axboe wrote:
>>> Hi Linus,
>>>
>>> Here are the block updates and fixes queued up for the 7.4 merge
>>> window. This pull request contains:
>>
>> Completely forgot to mention that this merge will throw conflicts. Both
>> block/bio.c and block/blk-zoned.c will need resolving. Details:
>
> Bah. My resolution ended up being different. But I think mine isn't
> actively wrong, and keeps some of the warnings.
>
> Holler if you hate it. Or if I just plain screwed up.
Looks fine to me - bio one is the same, and the blk-zoned.c looks OK to
me - you kept the pr_warn() and a check that blk_zstate_set() covers,
but that's fine. Thanks!
--
Jens Axboe
next prev parent reply other threads:[~2026-10-25 3:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-21 14:43 [GIT PULL] Block updates for 7.4-rc Jens Axboe
2026-10-21 15:10 ` Jens Axboe
2026-10-25 0:18 ` Linus Torvalds
2026-10-25 3:09 ` Jens Axboe [this message]
2026-10-25 0:20 ` pr-tracker-bot
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=9e552c09-f0df-4123-9fee-60541177a986@kernel.dk \
--to=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=torvalds@linux-foundation.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