From: Jens Axboe <axboe@kernel•dk>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Al Viro <viro@zeniv•linux.org.uk>
Cc: Keith Busch <kbusch@kernel•org>,
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 vfs tree
Date: Thu, 14 Jul 2022 10:36:35 -0600 [thread overview]
Message-ID: <0904ae71-972f-f183-f295-bce3b8518fcf@kernel.dk> (raw)
In-Reply-To: <20220714120840.1e1f8c63@canb.auug.org.au>
On 7/13/22 8:08 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> block/bio.c
>
> between commits:
>
> 35006342b739 ("block: ensure iov_iter advances for added pages")
> 248022ffae3f ("block: ensure bio_iov_add_page can't fail")
> 7b1ccdf617ca ("block: fix leaking page ref on truncated direct io")
> 9a6469060316 ("block: convert to advancing variants of iov_iter_get_pages{,_alloc}()")
>
> from the vfs tree and commits:
>
> 5a044eef1265 ("block: ensure iov_iter advances for added pages")
> ac3c48e32c04 ("block: ensure bio_iov_add_page can't fail")
> 44b6b0b0e980 ("block: fix leaking page ref on truncated direct io")
>
> from the block tree.
I pinged Al about this the other day, but haven't heard back yet. It's
not clear to me what block bits he has in his tree. We'll get it sorted
out.
--
Jens Axboe
next prev parent reply other threads:[~2022-07-14 16:36 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 2:08 linux-next: manual merge of the block tree with the vfs tree Stephen Rothwell
2022-07-14 16:36 ` Jens Axboe [this message]
2022-07-15 0:52 ` Al Viro
2022-07-15 1:04 ` Al Viro
2022-07-18 2:59 ` Stephen Rothwell
2022-07-18 4:58 ` Al Viro
2022-07-19 16:52 ` Jens Axboe
2022-07-20 2:45 ` Al Viro
2022-07-20 3:00 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2024-05-10 2:34 Stephen Rothwell
2024-05-14 1:32 ` Stephen Rothwell
2022-11-28 0:20 Stephen Rothwell
2022-07-15 3:09 Stephen Rothwell
2022-07-11 3:57 Stephen Rothwell
2022-07-11 3:38 Stephen Rothwell
2022-05-23 2:28 Stephen Rothwell
2022-05-23 2:58 ` Jens Axboe
2022-05-23 22:54 ` Stephen Rothwell
2021-01-27 3:24 Stephen Rothwell
2019-12-20 1:36 Stephen Rothwell
2019-12-20 5:34 ` Jens Axboe
2020-01-20 1:40 ` Stephen Rothwell
2020-01-20 2:45 ` Jens Axboe
2020-01-20 2:57 ` Jens Axboe
2018-05-29 4:37 Stephen Rothwell
2018-05-29 4:33 Stephen Rothwell
2018-05-29 8:12 ` Christoph Hellwig
2018-05-29 14:22 ` Jens Axboe
2018-05-29 21:40 ` Stephen Rothwell
2018-05-29 22:17 ` Jens Axboe
2017-02-02 2:44 Stephen Rothwell
2017-02-21 22:14 ` Stephen Rothwell
2016-12-12 1:31 Stephen Rothwell
2016-12-12 1:44 ` Al Viro
2016-12-12 2:00 ` Ming Lei
2015-02-09 3:55 Stephen Rothwell
2015-01-27 3:57 Stephen Rothwell
2015-01-27 4:00 ` Jens Axboe
2015-01-27 4:54 ` Al Viro
2015-01-28 17:11 ` Christoph Hellwig
2015-01-29 5:15 ` Al Viro
2015-02-01 5:56 ` Al Viro
2015-02-02 8:06 ` Christoph Hellwig
2013-04-04 2:16 Stephen Rothwell
2010-05-18 3:04 Stephen Rothwell
2010-05-18 15:37 ` H Hartley Sweeten
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=0904ae71-972f-f183-f295-bce3b8518fcf@kernel.dk \
--to=axboe@kernel$(echo .)dk \
--cc=kbusch@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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