Merge tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Oct 2016 02:06:59 +0000 (19:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Oct 2016 02:06:59 +0000 (19:06 -0700)
Pull NFS client bugfixes from Anna Schumaker:
 "Just two bugfixes this time:

  Stable bugfix:
   - Fix last_write_offset incorrectly set to page boundary

  Other bugfix:
   - Fix missing-braces warning"

* tag 'nfs-for-4.9-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  nfs4: fix missing-braces warning
  pnfs/blocklayout: fix last_write_offset incorrectly set to page boundary

1  2 
fs/nfs/nfs4proc.c

Simple merge