From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
David Sterba <dsterba@suse.cz>
Cc: Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Martin Raiber <martin@urbackup.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the btrfs tree
Date: Mon, 15 Feb 2021 08:46:34 +1100 [thread overview]
Message-ID: <20210215084634.06c1b430@canb.auug.org.au> (raw)
In-Reply-To: <20210127223918.1b3e4b3f@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]
Hi all,
On Wed, 27 Jan 2021 22:39:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> 0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync IO")
>
> from the btrfs tree and commit:
>
> ddcd14c48a30 ("mm/filemap: rename generic_file_buffered_read to filemap_read")
>
> 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.
>
> diff --cc fs/btrfs/file.c
> index 5282f456c99c,898ef7b792b7..000000000000
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@@ -3629,18 -3639,7 +3629,18 @@@ static ssize_t btrfs_file_read_iter(str
> return ret;
> }
>
> - return filemap_read(iocb, to, ret);
> + if (iocb->ki_flags & IOCB_NOWAIT)
> + iocb->ki_flags |= IOCB_NOIO;
> +
> - ret = generic_file_buffered_read(iocb, to, ret);
> ++ ret = filemap_read(iocb, to, ret);
> +
> + if (iocb->ki_flags & IOCB_NOWAIT) {
> + iocb->ki_flags &= ~IOCB_NOIO;
> + if (ret == 0)
> + ret = -EAGAIN;
> + }
> +
> + return ret;
> }
>
> const struct file_operations btrfs_file_operations = {
With the merge window about to open, this is a reminder that this
conflict still exists.
The btrfs tree commit is now
1605f1b63c76 ("btrfs: Prevent nowait or async read from doing sync IO")
The akpm-current commit is now
de45c82ebea8 ("mm/filemap: rename generic_file_buffered_read to filemap_read")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-14 21:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 11:39 linux-next: manual merge of the akpm-current tree with the btrfs tree Stephen Rothwell
2021-02-14 21:46 ` Stephen Rothwell [this message]
2021-02-25 23:32 ` Stephen Rothwell
2021-02-26 5:16 ` Christoph Hellwig
2021-03-01 11:04 ` David Sterba
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 11:11 Stephen Rothwell
2020-06-03 2:07 ` Stephen Rothwell
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=20210215084634.06c1b430@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=dsterba@suse.cz \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin@urbackup.org \
--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).