From: Jens Axboe <axboe@kernel.dk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Mark Brown <broonie@kernel.org>,
David Hildenbrand <david@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Tal Zussman <tz2294@columbia.edu>,
Vlastimil Babka <vbabka@kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the mm tree
Date: Tue, 20 Oct 2026 11:13:23 -0600 [thread overview]
Message-ID: <af63d378-d6d2-4fe4-bc2d-15f894b60624@kernel.dk> (raw)
In-Reply-To: <20261020100055.3e388e03fcd804f0cbde04f5@linux-foundation.org>
On 10/20/26 11:00 AM, Andrew Morton wrote:
> On Tue, 20 Oct 2026 06:45:16 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
>> On 10/20/26 6:27 AM, Mark Brown wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the block tree got a conflict in:
>>>
>>> block/bio.c
>>>
>>> between commit:
>>>
>>> d4ee6948bcabb ("block: restore the iterator when rejecting a misaligned bio")
>>>
>>> from the mm tree and commit:
>>>
>>> 73a0ff6030afc ("block: fail a short atomic pin in bio_iov_iter_get_pages()")
>>>
>>> from the block tree.
>>
>> I suspected as much when I saw Andrew pick it up. Andrew, perhaps
>> let's queue it where it belongs?
>
> I was hoping to get some review feedback before sending it over
> formally.
>
> I'll send it now.
Applied - can you double check? Flow is a bit different in there
compared to the one you patched against, entirely hand applied.
https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git/commit/?h=for-7.4/block&id=40d070cbb1906896d6fd65c39722d2411830ed9f
--
Jens Axboe
next prev parent reply other threads:[~2026-10-20 17:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-20 12:27 Mark Brown
2026-10-20 12:45 ` Jens Axboe
2026-10-20 17:00 ` Andrew Morton
2026-10-20 17:13 ` Jens Axboe [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-02 0:27 Stephen Rothwell
2024-05-13 23:41 ` Stephen Rothwell
2024-05-13 23:43 ` Edgecombe, Rick P
2024-02-14 0:25 Stephen Rothwell
2024-03-11 21:54 ` Stephen Rothwell
2023-06-16 1:58 Stephen Rothwell
2023-06-16 3:50 ` Andrew Morton
2023-06-16 9:56 ` David Howells
2023-06-16 16:07 ` Jens Axboe
2023-06-16 19:44 ` Vishal Moola
2023-06-16 1:50 Stephen Rothwell
2023-03-22 23:02 Stephen Rothwell
2023-03-22 23:13 ` David Howells
2023-03-22 23:15 ` Jens Axboe
2023-03-22 23:26 ` Andrew Morton
2023-03-23 0:03 ` Stephen Rothwell
2023-03-23 0:49 ` Jens Axboe
2023-03-23 0:04 ` David Howells
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=af63d378-d6d2-4fe4-bc2d-15f894b60624@kernel.dk \
--to=axboe@kernel.dk \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=david@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=tz2294@columbia.edu \
--cc=vbabka@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
all inboxes | Powered by JetHome®