Merge branch 'bugfixes'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 22 Jan 2016 16:02:36 +0000 (11:02 -0500)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 22 Jan 2016 16:02:36 +0000 (11:02 -0500)
commit6d45c042f35ea9b27bf946380f74ff75d32280c9
tree065c108254a768aa12d145374b1b9f6f10591ac3
parent6272dcc6beebbc2d8cf4165b628169e878f143e0
parent082fa37d1351a41afc491d44a1d095cb8d919aa2
Merge branch 'bugfixes'

* bugfixes:
  pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn
  pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN
fs/nfs/flexfilelayout/flexfilelayout.c
fs/nfs/flexfilelayout/flexfilelayoutdev.c