aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6Linus Torvalds2006-03-25
|\
| * [PATCH] aoe [3/3]: update version to 22Ed L. Cashin2006-03-24
| * [PATCH] aoe [2/3]: don't request ATA device ID on ATA errorEd L. Cashin2006-03-24
| * [PATCH] aoe [1/3]: support multiple AoE listenersEd L. Cashin2006-03-24
| * [PATCH] aoe: do not stop retransmit timer when device goes downEd L. Cashin2006-03-24
| * [PATCH] aoe [8/8]: update driver version numberEd L. Cashin2006-03-24
| * [PATCH] aoe [7/8]: update driver compatibility stringEd L. Cashin2006-03-24
| * [PATCH] aoe [6/8]: update device information on last closeEd L. Cashin2006-03-24
| * [PATCH] aoe [5/8]: allow network interface migration on packet retransmitEd L. Cashin2006-03-24
| * [PATCH] aoe [4/8]: use less confusing driver nameEd L. Cashin2006-03-24
| * [PATCH] aoe [3/8]: increase allowed outstanding packetsEd L. Cashin2006-03-24
| * [PATCH] aoe [2/8]: support dynamic resizing of AoE devicesEd L. Cashin2006-03-24
| * [PATCH] aoe [1/8]: zero packet data after skb allocationEd L. Cashin2006-03-24
* | Merge git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2006-03-25
|\ \
| * \ Merge branch 'linus'Trond Myklebust2006-03-23
| |\ \
| * \ \ Merge branch 'linus'Trond Myklebust2006-03-21
| |\ \ \
| * | | | SUNRPC,RPCSEC_GSS: spkm3--fix config dependenciesJ. Bruce Fields2006-03-20
| * | | | SUNRPC,RPCSEC_GSS: spkm3: import contexts using NID_cast5_cbcJ. Bruce Fields2006-03-20
| * | | | LOCKD: Make nlmsvc_traverse_shares return voidJ. Bruce Fields2006-03-20
| * | | | LOCKD: nlmsvc_traverse_blocks return is unusedJ. Bruce Fields2006-03-20
| * | | | SUNRPC,RPCSEC_GSS: fix krb5 sequence numbers.J. Bruce Fields2006-03-20
| * | | | NFSv4: Dont list system.nfs4_acl for filesystems that don't support it.J. Bruce Fields2006-03-20
| * | | | SUNRPC,RPCSEC_GSS: remove unnecessary kmalloc of a checksumJ. Bruce Fields2006-03-20
| * | | | SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release()Trond Myklebust2006-03-20
| * | | | SUNRPC: Fix memory barriers for req->rq_receivedTrond Myklebust2006-03-20
| * | | | NFS: Fix a race in nfs_sync_inode()Trond Myklebust2006-03-20
| * | | | NFS: Clean up nfs_flush_list()Trond Myklebust2006-03-20
| * | | | NFS: Fix a race with PG_private and nfs_release_page()Trond Myklebust2006-03-20
| * | | | NFSv4: Ensure the callback daemon flushes signalsTrond Myklebust2006-03-20
| * | | | SUNRPC: Fix a 'Busy inodes' error in rpc_pipefsTrond Myklebust2006-03-20
| * | | | NFS, NLM: Allow blocking locks to respect signalsTrond Myklebust2006-03-20
| * | | | NFS: Make nfs_fhget() return appropriate error valuesTrond Myklebust2006-03-20
| * | | | NFSv4: Fix an oops in nfs4_fill_superTrond Myklebust2006-03-20
| * | | | lockd: blocks should hold a reference to the nlm_fileTrond Myklebust2006-03-20
| * | | | NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCETrond Myklebust2006-03-20
| * | | | NFSv4: Send the delegation stateid for SETATTR callsTrond Myklebust2006-03-20
| * | | | NFSv4: Ensure nfs_callback_down() calls svc_destroy()Trond Myklebust2006-03-20
| * | | | lockd: Fix a typo in nlmsvc_grant_release()Trond Myklebust2006-03-20
| * | | | lockd: Add helper for *_RES callbacksTrond Myklebust2006-03-20
| * | | | NLM: Add nlmclnt_release_callTrond Myklebust2006-03-20
| * | | | NLM: Fix nlmclnt_test to not copy private part of locksTrond Myklebust2006-03-20
| * | | | NLM: Simplify client locksTrond Myklebust2006-03-20
| * | | | NFS: O_DIRECT needs to use a completionTrond Myklebust2006-03-20
| * | | | NFS: Clean up nfs_get_user_pagesTrond Myklebust2006-03-20
| * | | | NFS: fix compiler warnings on 64-bit platformsChuck Lever2006-03-20
| * | | | SUNRPC: fix compile warnings on 64-bit platformsChuck Lever2006-03-20
| * | | | NLM: nlmclnt_cancel_callback should accept NLM_LCK_DENIED errorsTrond Myklebust2006-03-20
| * | | | lockd: Fix Oopses due to list manipulation errors.Trond Myklebust2006-03-20
| * | | | lockd: stop abusing file_lock_listChristoph Hellwig2006-03-20
| * | | | lockd: Make lockd use rpc_new_client() instead of rpc_create_clientTrond Myklebust2006-03-20