linux-next: manual merge of the akpm-current tree with the btrfs tree

[Stephen Rothwell]

Hi all,

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.

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.

-- 
Cheers,
Stephen Rothwell

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

Attachment: pgpV7iFzBMaHY.pgp
Description: OpenPGP digital signature