From: Linus Torvalds Date: Sat, 2 Feb 2008 03:31:28 +0000 (+1100) Subject: Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux X-Git-Tag: v2.6.25-rc1~1072 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=63e9b66e29357dd12e8b1d3ebf7036e7591f81e3;p=linux-2.6-omap-h63xx.git Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux * 'for-linus' of git://linux-nfs.org/~bfields/linux: (100 commits) SUNRPC: RPC program information is stored in unsigned integers SUNRPC: Move exported symbol definitions after function declaration part 2 NLM: tear down RPC clients in nlm_shutdown_hosts SUNRPC: spin svc_rqst initialization to its own function nfsd: more careful input validation in nfsctl write methods lockd: minor log message fix knfsd: don't bother mapping putrootfh enoent to eperm rdma: makefile rdma: ONCRPC RDMA protocol marshalling rdma: SVCRDMA sendto rdma: SVCRDMA recvfrom rdma: SVCRDMA Core Transport Services rdma: SVCRDMA Transport Module rdma: SVCRMDA Header File svc: Add svc_xprt_names service to replace svc_sock_names knfsd: Support adding transports by writing portlist file svc: Add svc API that queries for a transport instance svc: Add /proc/sys/sunrpc/transport files svc: Add transport hdr size for defer/revisit svc: Move the xprt independent code to the svc_xprt.c file ... --- 63e9b66e29357dd12e8b1d3ebf7036e7591f81e3