Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Feb 2021 08:46:34 +1100
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
Message-ID: <20210215084634.06c1b430@canb.auug.org.au>
In-Reply-To: <20210127223918.1b3e4b3f@canb.auug.org.au>
References: <20210127223918.1b3e4b3f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.4DdQRYZz9OiqpHX/i5.qP0";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/.4DdQRYZz9OiqpHX/i5.qP0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:
>=20
>   fs/btrfs/file.c
>=20
> between commit:
>=20
>   0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync IO")
>=20
> from the btrfs tree and commit:
>=20
>   ddcd14c48a30 ("mm/filemap: rename generic_file_buffered_read to filemap=
_read")
>=20
> from the akpm-current tree.
>=20
> 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.
>=20
> 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;
>   	}
>  =20
>  -	return filemap_read(iocb, to, ret);
>  +	if (iocb->ki_flags & IOCB_NOWAIT)
>  +		iocb->ki_flags |=3D IOCB_NOIO;
>  +
> - 	ret =3D generic_file_buffered_read(iocb, to, ret);
> ++	ret =3D filemap_read(iocb, to, ret);
>  +
>  +	if (iocb->ki_flags & IOCB_NOWAIT) {
>  +		iocb->ki_flags &=3D ~IOCB_NOIO;
>  +		if (ret =3D=3D 0)
>  +			ret =3D -EAGAIN;
>  +	}
>  +
>  +	return ret;
>   }
>  =20
>   const struct file_operations btrfs_file_operations =3D {

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_r=
ead")

--=20
Cheers,
Stephen Rothwell

--Sig_/.4DdQRYZz9OiqpHX/i5.qP0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmApmjoACgkQAVBC80lX
0GzgmggAkKTaLtuRpY/PIWibxnYsOT0ICBWlsLzTI2DwqzfKqi9g0WTwmkvV5nvx
4FNFVOgT1MAxXvKG+DRMb9MCzMiy5HnwxrSqKtmXkqPEoTsJu4hpcLkdO02RoMeg
/kCdgP9uBZj1/uFP2/IqXMLrmSfi1sdw5O+4ZeCKLQmVgJpVKLTkFrxUvoYCGW7X
7fx0pAR55uPzce2V3B/1kRxEM5+puNWfVqzjOK0ChZj5wpWTlJzKi/X1AHs4zeWy
AEOoUpehy/A9EaPPnPJGVQNf5vLeZ/m5YrYcgmAx4Dd3YBWZfTyLDA7E6NBKwriq
WLXbhSEHHnoC5EkhanyR2i7nLkVcig==
=O4Ra
-----END PGP SIGNATURE-----

--Sig_/.4DdQRYZz9OiqpHX/i5.qP0--