From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Mon, 17 Aug 2015 18:36:22 +0000 (-0500)
Subject: Merge branch 'bugfixes'
X-Git-Tag: firefly_0821_release~176^2~1127^2~60
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37bfcc14b2b44ce03930eeb2c3de1c20f7da6fb9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bugfixes'

* bugfixes:
  SUNRPC: Fix a thinko in xs_connect()
  NFSv4.1/pNFS: Fix borken function _same_data_server_addrs_locked()
  NFS: nfs_set_pgio_error sometimes misses errors
---

37bfcc14b2b44ce03930eeb2c3de1c20f7da6fb9