linux-next: manual merge of the nfs-anna tree with the nfs tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  net/sunrpc/xdr.c

between commit:

  0279024f2270 ("SUNRPC: Fix up xdr_set_page()")

from the nfs tree and commit:

  861b1da5a534 ("SUNRPC: Keep buf->len in sync with xdr->nwords when expanding holes")

from the nfs-anna 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 net/sunrpc/xdr.c
index c852d199c789,5b848fe65c81..000000000000
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@@ -1316,8 -1326,8 +1317,8 @@@ uint64_t xdr_expand_hole(struct xdr_str
  					bytes);
  	_zero_pages(buf->pages, buf->page_base + offset, length);
  
- 	buf->len += length - (from - offset) - truncated;
+ 	buf->len += length - (from - offset);
 -	xdr_set_page(xdr, offset + length, PAGE_SIZE);
 +	xdr_set_page(xdr, offset + length, xdr_stream_remaining(xdr));
  	return length;
  }
  EXPORT_SYMBOL_GPL(xdr_expand_hole);

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