summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-07-316-18/+55
* Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-07-3127-237/+368
|\
| * NFSd: make boot_time variable per network namespaceStanislav Kinsbursky2012-07-273-16/+25
| * NFSd: make grace end flag per network namespaceStanislav Kinsbursky2012-07-272-5/+4
| * Lockd: move grace period management from lockd() to per-net functionsStanislav Kinsbursky2012-07-271-6/+3
| * LockD: pass actual network namespace to grace period management functionsStanislav Kinsbursky2012-07-2710-58/+67
| * LockD: manage grace list per network namespaceStanislav Kinsbursky2012-07-273-3/+13
| * SUNRPC: service request network namespace helper introducedStanislav Kinsbursky2012-07-275-7/+9
| * NFSd: make nfsd4_manager allocated per network namespace context.Stanislav Kinsbursky2012-07-272-13/+21
| * LockD: make lockd manager allocated per network namespaceStanislav Kinsbursky2012-07-272-8/+12
| * LockD: manage grace period per network namespaceStanislav Kinsbursky2012-07-272-6/+13
| * Lockd: add more debug to host shutdown functionsStanislav Kinsbursky2012-07-271-2/+2
| * Lockd: host complaining function introducedStanislav Kinsbursky2012-07-271-27/+30
| * LockD: manage used host count per networks namespaceStanislav Kinsbursky2012-07-272-0/+19
| * LockD: manage garbage collection timeout per networks namespaceStanislav Kinsbursky2012-07-272-3/+10
| * LockD: make garbage collector network namespace aware.Stanislav Kinsbursky2012-07-271-9/+13
| * LockD: mark host per network namespace on garbage collectStanislav Kinsbursky2012-07-273-8/+16
| * nfsd4: fix missing fault_inject.h includeJ. Bruce Fields2012-07-271-0/+1
| * locks: move lease-specific code out of locks_delete_lockJ. Bruce Fields2012-07-271-6/+5
| * locks: prevent side-effects of locks_release_private before file_lock is init...Filipe Brandenburger2012-07-271-11/+6
| * NFSd: set nfsd_serv to NULL after service destructionStanislav Kinsbursky2012-07-252-5/+7
| * NFSd: introduce nfsd_destroy() helperStanislav Kinsbursky2012-07-253-17/+14
| * nfsd: add get_uint for u32'sJ. Bruce Fields2012-07-252-3/+19
| * NFSd: fix locking in nfsd_forget_delegations()Stanislav Kinsbursky2012-07-251-6/+17
| * nfsd4: fix cr_principal comparison check in same_credsVivek Trivedi2012-07-251-2/+2
| * SUNRPC/cache: fix reporting of expired cache entries in 'content' file.NeilBrown2012-07-121-1/+4
| * sunrpc/cache.h: replace simple_strtoulEldad Zack2012-07-111-5/+1
| * sunrpc/cache.h: fix coding styleEldad Zack2012-07-111-4/+10
| * nfsd: share some function prototypesJ. Bruce Fields2012-07-101-0/+2
| * nfsd: allow owner_override only for regular filesJ. Bruce Fields2012-07-101-1/+9
| * nfsd4: release openowners on free in >=4.1 caseJ. Bruce Fields2012-07-101-6/+13
| * nfsd4: our filesystems are normally case sensitiveJ. Bruce Fields2012-07-101-1/+1
| * nfsd4: process_open2 cleanupJ. Bruce Fields2012-06-201-5/+3
| * nfsd4: nfsd4_lock() cleanupJ. Bruce Fields2012-06-201-12/+3
| * nfsd4: remove unnecessary commentJ. Bruce Fields2012-06-201-1/+0
| * NFSD: TEST_STATEID should not return NFS4ERR_STALE_STATEIDChuck Lever2012-06-202-7/+16
| * nfsd: probe the back channel on new connectionsWeston Andros Adamson2012-06-201-0/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-07-3125-898/+1351
|\ \
| * | rbd: create rbd_refresh_helper()Alex Elder2012-07-301-10/+15
| * | rbd: return obj version in __rbd_refresh_header()Alex Elder2012-07-301-14/+11
| * | rbd: fixes in rbd_header_from_disk()Alex Elder2012-07-301-5/+13
| * | rbd: always pass ops array to rbd_req_sync_op()Alex Elder2012-07-301-30/+16
| * | rbd: pass null version pointer in add_snap()Alex Elder2012-07-301-2/+1
| * | rbd: make rbd_create_rw_ops() return a pointerAlex Elder2012-07-301-31/+39
| * | rbd: have __rbd_add_snap_dev() return a pointerAlex Elder2012-07-301-15/+22
| * | libceph: recheck con state after allocating incoming messageSage Weil2012-07-301-1/+8
| * | libceph: change ceph_con_in_msg_alloc convention to be less weirdSage Weil2012-07-301-25/+31
| * | libceph: avoid dropping con mutex before faultSage Weil2012-07-301-3/+1
| * | libceph: verify state after retaking con lock after dispatchSage Weil2012-07-301-1/+2
| * | libceph: revoke mon_client messages on session restartSage Weil2012-07-301-0/+4
OpenPOWER on IntegriCloud