From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Aug 2015 03:22:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: firefly_0821_release~176^2~1241
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4c53bad4095aec461ed2488534ce6c7e672228a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull 9p regression fix from Al Viro:
 "Fix for breakage introduced when switching p9_client_{read,write}() to
  struct iov_iter * (went into 4.1)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  9p: ensure err is initialized to 0 in p9_client_read/write
---

c4c53bad4095aec461ed2488534ce6c7e672228a