From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 May 2020 19:04:52 +0000 (-0700)
Subject: Merge tag 'nfsd-5.7-rc-2' of git://git.linux-nfs.org/projects/cel/cel-2.6
X-Git-Tag: v5.10.7~2645
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=152036d1379ffd6985262743dcf6b0f9c75f83a4;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'nfsd-5.7-rc-2' of git://git.linux-nfs.org/projects/cel/cel-2.6

Pull nfsd fixes from Chuck Lever:
 "Resolve a data integrity problem with NFSD that I inadvertently
  introduced last year.

  The change I made makes the NFS server's duplicate reply cache
  ineffective when krb5i or krb5p are in use, thus allowing the replay
  of non-idempotent NFS requests such as RENAME, SETATTR, or even
  WRITEs"

* tag 'nfsd-5.7-rc-2' of git://git.linux-nfs.org/projects/cel/cel-2.6:
  SUNRPC: Revert 241b1f419f0e ("SUNRPC: Remove xdr_buf_trim()")
  SUNRPC: Fix GSS privacy computation of auth->au_ralign
  SUNRPC: Add "@len" parameter to gss_unwrap()
---

152036d1379ffd6985262743dcf6b0f9c75f83a4