From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 22 Jan 2016 16:02:36 +0000 (-0500)
Subject: Merge branch 'bugfixes'
X-Git-Tag: Ubuntu-5.2.0-15.16~9886^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6d45c042f35ea9b27bf946380f74ff75d32280c9;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'bugfixes'

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

6d45c042f35ea9b27bf946380f74ff75d32280c9