Merge tag 'nfsd-5.7-rc-2' of git://git.linux-nfs.org/projects/cel/cel-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 May 2020 19:04:52 +0000 (12:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 May 2020 19:04:52 +0000 (12:04 -0700)
commit152036d1379ffd6985262743dcf6b0f9c75f83a4
treee59254f5d9dc090859bf63f08df97906b18a2a6b
parent995b819f291e872b191893a2e8b0f9c9d8a570d9
parent0a8e7b7d08466b5fc52f8e96070acc116d82a8bb
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()