From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the btrfs tree
Date: Wed, 3 Jun 2020 12:07:51 +1000 [thread overview]
Message-ID: <20200603120751.5cc12744@canb.auug.org.au> (raw)
In-Reply-To: <20200525211128.1cc8c00d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-06-03 2:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 11:11 linux-next: manual merge of the akpm-current tree with the btrfs tree Stephen Rothwell
2020-06-03 2:07 ` Stephen Rothwell [this message]
2021-01-27 11:39 Stephen Rothwell
2021-02-14 21:46 ` Stephen Rothwell
2021-02-25 23:32 ` Stephen Rothwell
2021-02-26 5:16 ` Christoph Hellwig
2021-03-01 11:04 ` David Sterba
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=20200603120751.5cc12744@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=willy@infradead.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;
as well as URLs for NNTP newsgroup(s).