From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 22:13:05 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: firefly_0821_release~7613^2~3580
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a0e3390787ef523699ae1f3f3ea0ca953e630be2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  nfs4: The difference of 2 pointers is ptrdiff_t
  nfs: testing the wrong variable
  nfs: handle lock context allocation failures in nfs_create_request
  Fixed Regression in NFS Direct I/O path
---

a0e3390787ef523699ae1f3f3ea0ca953e630be2