]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit44fac66e5f3027793562461289c143f9b7a37bee
tree065c108254a768aa12d145374b1b9f6f10591ac3
parent6a98c49f6d386120e282f74d1d79ddd2ada52361
parent0b9b1a61fb92bee8aa38a08e497539f7f4bf9ffc
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