lkml.org 
[lkml]   [2021]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the block tree with the btrfs tree
Hi all,

On Tue, 2 Feb 2021 13:45:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/iomap/direct-io.c
>
> between commit:
>
> dffd1df2d29a ("iomap: support REQ_OP_ZONE_APPEND")
>
> from the btrfs tree and commit:
>
> 3e1a88ec9625 ("bio: add a helper calculating nr segments to alloc")
>
> from the block tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc fs/iomap/direct-io.c
> index e4c258a2cefc,ea1e8f696076..000000000000
> --- a/fs/iomap/direct-io.c
> +++ b/fs/iomap/direct-io.c
> @@@ -292,13 -260,7 +289,14 @@@ iomap_dio_bio_actor(struct inode *inode
> iomap_dio_zero(dio, iomap, pos - pad, pad);
> }
>
> + /*
> + * Set the operation flags early so that bio_iov_iter_get_pages
> + * can set up the page vector appropriately for a ZONE_APPEND
> + * operation.
> + */
> + bio_opf = iomap_dio_bio_opflags(dio, iomap, use_fua);
> +
> + nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter, BIO_MAX_PAGES);
> do {
> size_t n;
> if (dio->error) {

With the merge window about to open, this is a reminder that this
conflict still exists.

The btrfs tree commit is now

c3b0e880bbfa ("iomap: support REQ_OP_ZONE_APPEND")

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-02-14 23:21    [W:0.040 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site