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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 7 Dec 2020 10:31:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Anna Schumaker <Anna.Schumaker@...app.com>,
        Trond Myklebust <trondmy@...il.com>,
        NFS Mailing List <linux-nfs@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Trond Myklebust <trond.myklebust@...merspace.com>
Subject: linux-next: manual merge of the nfs-anna tree with the nfs tree

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);

Content of type "application/pgp-signature" skipped