From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 27 Nov 2007 03:42:59 +0000 (-0800)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.24-rc4~92
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=423eaf8f00d89ca79bb2c9d4d22e92c9774e2d8a;p=~shefty%2Frdma-dev.git

Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6:
  NFS: Clean up new multi-segment direct I/O changes
  NFS: Ensure we return zero if applications attempt to write zero bytes
  NFS: Support multiple segment iovecs in the NFS direct I/O path
  NFS: Introduce iovec I/O helpers to fs/nfs/direct.c
  SUNRPC: Add missing "space" to net/sunrpc/auth_gss.c
  SUNRPC: make sunrpc/xprtsock.c:xs_setup_{udp,tcp}() static
  NFS: fs/nfs/dir.c should #include "internal.h"
  NFS: make nfs_wb_page_priority() static
  NFS: mount failure causes bad page state
  SUNRPC: remove NFS/RDMA client's binary sysctls
  kernel BUG at fs/nfs/namespace.c:108! - can be triggered by bad server
  sunrpc: rpc_pipe_poll may miss available data in some cases
  sunrpc: return error if unsupported enctype or cksumtype is encountered
  sunrpc: gss_pipe_downcall(), don't assume all errors are transient
  NFS: Fix the ustat() regression
---

423eaf8f00d89ca79bb2c9d4d22e92c9774e2d8a