From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 22 Jan 2016 16:02:36 +0000 (-0500)
Subject: Merge branch 'bugfixes'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d45c042f35ea9b27bf946380f74ff75d32280c9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'bugfixes'

* bugfixes:
  pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn
  pNFS/flexfiles: Improve merging of errors in LAYOUTRETURN
---

6d45c042f35ea9b27bf946380f74ff75d32280c9