Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 23 Mar 2023 10:02:04 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     David Howells <dhowells@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Stoakes <lstoakes@gmail.com>
Subject: linux-next: manual merge of the block tree with the mm tree
Message-ID: <20230323100204.0917cecf@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/F_Hox9gVbvq./rE=fe37W1n";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/F_Hox9gVbvq./rE=fe37W1n
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the block tree got a conflict in:

  lib/iov_iter.c

between commit:

  c4cf24ce34b7 ("iov_iter: add copy_page_to_iter_atomic()")

from the mm tree and commit:

  a53f5dee3448 ("iov_iter: Kill ITER_PIPE")

from the block 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.

--=20
Cheers,
Stephen Rothwell

diff --cc lib/iov_iter.c
index 48ca1c5dfc04,fad95e4cf372..000000000000
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@@ -821,60 -532,6 +532,34 @@@ size_t copy_page_from_iter_atomic(struc
  }
  EXPORT_SYMBOL(copy_page_from_iter_atomic);
 =20
 +size_t copy_page_to_iter_atomic(struct page *page, unsigned offset, size_=
t bytes,
 +				struct iov_iter *i)
 +{
 +	char *kaddr =3D kmap_local_page(page);
 +	char *p =3D kaddr + offset;
 +	size_t copied =3D 0;
 +
 +	if (!page_copy_sane(page, offset, bytes) ||
 +	    WARN_ON_ONCE(i->data_source))
 +		goto out;
 +
 +	if (unlikely(iov_iter_is_pipe(i))) {
 +		copied =3D copy_page_to_iter_pipe(page, offset, bytes, i);
 +		goto out;
 +	}
 +
 +	iterate_and_advance(i, bytes, base, len, off,
 +		copyout(base, p + off, len),
 +		memcpy(base, p + off, len)
 +	)
 +	copied =3D bytes;
 +
 +out:
 +	kunmap_local(kaddr);
 +	return copied;
 +}
 +EXPORT_SYMBOL(copy_page_to_iter_atomic);
 +
- static void pipe_advance(struct iov_iter *i, size_t size)
- {
- 	struct pipe_inode_info *pipe =3D i->pipe;
- 	int off =3D i->last_offset;
-=20
- 	if (!off && !size) {
- 		pipe_discard_from(pipe, i->start_head); // discard everything
- 		return;
- 	}
- 	i->count -=3D size;
- 	while (1) {
- 		struct pipe_buffer *buf =3D pipe_buf(pipe, i->head);
- 		if (off) /* make it relative to the beginning of buffer */
- 			size +=3D abs(off) - buf->offset;
- 		if (size <=3D buf->len) {
- 			buf->len =3D size;
- 			i->last_offset =3D last_offset(buf);
- 			break;
- 		}
- 		size -=3D buf->len;
- 		i->head++;
- 		off =3D 0;
- 	}
- 	pipe_discard_from(pipe, i->head + 1); // discard everything past this one
- }
-=20
  static void iov_iter_bvec_advance(struct iov_iter *i, size_t size)
  {
  	const struct bio_vec *bvec, *end;

--Sig_/F_Hox9gVbvq./rE=fe37W1n
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmQbiOwACgkQAVBC80lX
0GyEnQf/adjSrEyVT5xgEmHcYmkA53kR4C6XwCEYlKz0LJsi9EDBenLoQD+UAywd
TMfEaC46VrVnxytjGdRFaCDOVmNRJ958dzBMhFQyJ8z3pmefRUHN7YEPTUoiLvsB
HAxklMthx7EdmurBJWxEDnhLyo0I+yhUWT5yTSyRqD6NbRxnCrF292OYF+EvxuVy
JbGfH2TPmi1gSkQsikDYPcdn9gbCIBVB0OPBOd0qXZSdKAc9FAzw/rB5Z2nxbuw5
2WlmHjhYd29wIh7hNnMr9PHDIycW7E76b/AXBPgeZVb2H+j+6R6RpJ2zw6WYdQgc
KVsD9ja8e4NzrHRv5R1zYbtFHr+2vA==
=O9gB
-----END PGP SIGNATURE-----

--Sig_/F_Hox9gVbvq./rE=fe37W1n--