Linus Torvalds
9f261e0113
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
...
* git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
NFS: unmark NFS direct I/O as experimental
NFS: add comments clarifying the use of nfs_post_op_update()
NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
NFS: Use SEEK_END instead of hardcoded value
NFSv4: When mounting with a port=0 argument, substitute port=2049
NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
NFSv4: Handle the condition NFS4ERR_FILE_OPEN
NFSv4: Retry lease recovery if it failed during a synchronous operation.
NFS: Don't invalidate the symlink we just stuffed into the cache
NFS: Make read() return an ESTALE if the file has been deleted
NFSv4: It's perfectly legal for clp to be NULL here....
NFS: nfs_lookup - don't hash dentry when optimising away the lookup
SUNRPC: Fix Oops in pmap_getport_done
SUNRPC: Add refcounting to the struct rpc_xprt
SUNRPC: Clean up soft task error handling
SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
Fix a referral error Oops
NFS: NFS_ROOT should use the new rpc_create API
NFS: Fix up compiler warnings on 64-bit platforms in client.c
...
Manually resolved conflict in net/sunrpc/xprtsock.c
2006-09-23 16:58:40 -07:00
..
2006-09-19 12:43:58 +01:00
2006-09-19 12:43:58 +01:00
2006-07-04 12:55:45 -07:00
2006-08-03 16:56:02 -04:00
2006-09-07 15:57:12 +01:00
2006-08-16 20:13:06 -05:00
2006-09-22 15:20:01 -07:00
2006-09-22 14:55:33 -07:00
2006-09-19 12:43:58 +01:00
2006-09-22 15:20:20 -07:00
2006-09-22 14:55:33 -07:00
2006-09-19 12:43:58 +01:00
2006-09-19 12:43:58 +01:00
2006-09-22 23:25:01 -04:00
2006-09-19 12:43:58 +01:00
2006-09-19 12:43:58 +01:00
2006-07-12 16:03:25 -07:00
2006-09-06 11:00:02 -07:00
2006-09-11 13:32:30 -04:00
2006-09-22 23:24:54 -04:00
2006-07-06 10:18:05 +02:00
2006-09-22 15:08:41 -07:00
2006-07-31 13:28:36 -07:00
2006-08-27 11:01:29 -07:00
2006-07-10 13:24:14 -07:00
2006-07-10 13:24:16 -07:00
2006-07-23 12:12:16 -07:00
2006-07-26 07:21:40 -07:00
2006-09-21 11:46:23 +10:00
2006-09-22 23:24:30 -04:00
2006-09-22 15:18:17 -07:00
2006-08-06 08:57:47 -07:00
2006-09-01 11:39:08 -07:00
2006-07-03 19:44:51 -07:00
2006-07-10 13:24:22 -07:00
2006-07-01 09:56:03 -07:00
2006-07-31 13:28:36 -07:00
2006-08-14 12:54:29 -07:00
2006-09-22 15:18:10 -07:00
2006-09-22 15:18:47 -07:00
2006-08-19 17:44:31 -04:00
2006-08-27 11:01:32 -07:00
2006-08-03 10:50:30 -04:00
2006-07-28 21:02:00 -07:00
2006-09-22 15:18:51 -07:00
2006-07-03 15:27:03 -07:00
2006-07-12 13:59:06 -07:00
2006-09-06 11:00:01 -07:00
2006-07-14 21:53:53 -07:00
2006-07-12 15:43:07 -07:00
2006-07-28 08:54:59 +02:00
2006-07-03 15:27:02 -07:00
2006-09-22 15:20:29 -07:00
2006-08-17 16:29:46 -07:00
2006-09-22 14:53:50 -07:00
2006-09-22 15:07:00 -07:00
2006-09-22 15:18:29 -07:00
2006-09-22 15:18:01 -07:00
2006-07-03 15:27:03 -07:00
2006-07-06 00:22:43 -04:00
2006-07-03 15:27:03 -07:00
2006-07-12 16:09:08 -07:00
2006-08-21 10:02:50 +02:00
2006-09-22 14:53:32 -07:00
2006-09-22 15:20:25 -07:00
2006-07-31 13:28:39 -07:00
2006-07-03 15:27:03 -07:00
2006-08-27 11:01:32 -07:00
2006-07-31 13:28:43 -07:00
2006-07-03 15:27:00 -07:00
2006-09-19 12:43:58 +01:00
2006-09-23 11:34:42 -07:00
2006-08-03 13:20:06 -07:00
2006-07-14 21:53:52 -07:00
2006-09-06 11:00:02 -07:00
2006-07-19 14:06:53 -04:00
2006-07-14 21:53:56 -07:00
2006-07-10 13:24:14 -07:00
2006-07-10 13:24:25 -07:00
2006-09-05 17:20:21 -04:00
2006-09-01 11:39:08 -07:00
2006-09-20 15:58:25 +02:00
2006-07-14 21:53:52 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-14 21:53:55 -07:00
2006-09-22 14:54:04 -07:00
2006-09-22 14:54:20 -07:00
2006-09-22 14:53:53 -07:00
2006-09-22 15:18:31 -07:00
2006-09-22 15:19:51 -07:00
2006-09-22 14:53:54 -07:00
2006-07-10 13:24:27 -07:00
2006-09-22 23:24:54 -04:00
2006-09-22 23:24:49 -04:00
2006-09-22 23:24:32 -04:00
2006-09-22 23:24:53 -04:00
2006-08-27 11:01:32 -07:00
2006-07-03 15:27:02 -07:00
2006-07-14 21:53:54 -07:00
2006-06-30 11:25:35 -07:00
2006-06-30 11:25:34 -07:00
2006-09-08 10:22:50 -07:00
2006-07-12 16:05:48 -07:00
2006-07-12 16:05:48 -07:00
2006-08-19 17:44:31 -04:00
2006-09-22 15:18:12 -07:00
2006-07-12 16:09:08 -07:00
2006-07-31 13:28:45 -07:00
2006-07-03 19:48:25 -07:00
2006-06-30 11:25:39 -07:00
2006-07-13 13:21:35 -07:00
2006-06-30 11:25:38 -07:00
2006-07-03 15:27:01 -07:00
2006-09-22 14:55:02 -07:00
2006-07-03 15:27:04 -07:00
2006-07-10 13:24:14 -07:00
2006-09-21 11:46:16 +10:00
2006-09-01 11:39:08 -07:00
2006-09-22 14:53:36 -07:00
2006-07-03 15:27:02 -07:00
2006-07-09 21:11:09 +01:00
2006-07-02 13:58:46 -07:00
2006-09-22 14:53:53 -07:00
2006-06-30 11:25:37 -07:00
2006-09-22 14:55:16 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:04 -07:00
2006-07-03 15:27:02 -07:00
2006-07-03 15:26:59 -07:00
2006-09-22 15:20:25 -07:00
2006-07-14 21:53:57 -07:00
2006-07-14 21:53:57 -07:00
2006-07-14 21:53:56 -07:00
2006-09-13 07:32:15 -07:00
2006-08-27 11:01:34 -07:00
2006-07-01 09:56:03 -07:00
2006-07-12 16:03:21 -07:00
2006-07-12 16:03:24 -07:00
2006-08-02 16:41:42 -07:00
2006-08-02 16:52:10 -07:00
2006-07-03 23:30:54 +02:00
2006-09-10 13:45:55 -03:00
2006-09-10 13:45:55 -03:00
2006-07-14 21:53:51 -07:00
2006-08-06 08:57:47 -07:00
2006-07-10 13:24:16 -07:00
2006-08-27 11:01:29 -07:00
2006-07-10 13:24:25 -07:00
2006-09-22 23:24:54 -04:00
2006-09-22 15:08:35 -07:00