| commit | 2c5d63d8f013f232fc6e353d9151b35ec7282d52 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 03 11:59:59 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 03 11:59:59 2008 -0800 |
| tree | 60dfd73e436b1420b4fc1e4b3c69d4b5e7a380d4 | |
| parent | 3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6 [diff] | |
| parent | e6e21970baff4845de74584e2efc8c964a55d574 [diff] |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 * git://git.linux-nfs.org/pub/linux/nfs-2.6: NFSv4: Fix open_to_lock_owner sequenceid allocation... NFSv4: nfs4_open_confirm must not set the open_owner as confirmed on error NFS: add newline to kernel warning message in auth_gss code NFSv4: Fix circular locking dependency in nfs4_kill_renewd NFS: Fix a possible Oops in fs/nfs/super.c