linux-next: manual merge of the block tree with the fscache tree

linux-next: manual merge of the block tree with the fscache tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

Hi all,

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

  lib/iov_iter.c

between commit:

  11432a3cc061 ("iov_iter: Add ITER_XARRAY")

from the fscache tree and commit:

  54c8195b4ebe ("iov_iter: optimise bvec iov_iter_advance()")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/iov_iter.c
index f53a57588489,e55357f09f71..000000000000
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@@ -1145,12 -1090,11 +1158,16 @@@ void iov_iter_advance(struct iov_iter *
  		i->count -= size;
  		return;
  	}
+ 	if (iov_iter_is_bvec(i)) {
+ 		iov_iter_bvec_advance(i, size);
+ 		return;
+ 	}
 -	iterate_and_advance(i, size, v, 0, 0, 0)
 +	if (unlikely(iov_iter_is_xarray(i))) {
 +		i->iov_offset += size;
 +		i->count -= size;
 +		return;
 +	}
 +	iterate_and_advance(i, size, v, 0, 0, 0, 0)
  }
  EXPORT_SYMBOL(iov_iter_advance);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]