lkml.org 
[lkml]   [2020]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm-current tree with the btrfs tree
Hi all,

On Mon, 25 May 2020 21:11:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/btrfs/inode.c
>
> between commit:
>
> f31e5f70919f ("btrfs: switch to iomap_dio_rw() for dio")
>
> from the btrfs tree and commit:
>
> 2167c1133b8b ("btrfs: convert from readpages to readahead")
>
> from the akpm-current tree.
>
> diff --cc fs/btrfs/inode.c
> index fb95efeb63ed,8b3489f229c7..000000000000
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@@ -10075,8 -10538,8 +10060,8 @@@ static const struct address_space_opera
> .readpage = btrfs_readpage,
> .writepage = btrfs_writepage,
> .writepages = btrfs_writepages,
> - .readpages = btrfs_readpages,
> + .readahead = btrfs_readahead,
> - .direct_IO = btrfs_direct_IO,
> + .direct_IO = noop_direct_IO,
> .invalidatepage = btrfs_invalidatepage,
> .releasepage = btrfs_releasepage,
> #ifdef CONFIG_MIGRATION

This is now a conflict between commit

ba206a026ff4 ("btrfs: convert from readpages to readahead")

from Linus' tree and commit

a43a67a2d715 ("btrfs: switch to iomap_dio_rw() for dio")

from the btrfs tree.
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-06-03 04:08    [W:0.033 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site