From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 May 2014 17:08:48 +0000 (-0700)
Subject: Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: Ubuntu-5.10.0-12.13~16887
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=80a1de29a5a67abac02cb10c32545eb231e0e778;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux

Pull two nfsd bugfixes from Bruce Fields:
 "Just two bugfixes, one for a merge-window-introduced ACL regression,
  the other for a longer-standing v4 state bug"

* 'for-3.15' of git://linux-nfs.org/~bfields/linux:
  nfsd4: warn on finding lockowner without stateid's
  nfsd4: remove lockowner when removing lock stateid
  nfsd4: fix corruption on setting an ACL.
---

80a1de29a5a67abac02cb10c32545eb231e0e778