summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/l...Linus Torvalds2010-10-262-0/+25
|\
| * Merge branch 'hwpoison-hugepages' into hwpoisonAndi Kleen2010-10-221-0/+15
| |\
| | * hugetlb: hugepage migration coreNaoya Horiguchi2010-10-081-0/+15
| * | Merge branch 'hwpoison-fixes-2.6.37' into hwpoisonAndi Kleen2010-10-221-0/+10
| |\ \
| | * | HWPOISON/signalfd: add support for addr_lsbHidetoshi Seto2010-10-081-0/+10
| | |/
* | | Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2010-10-2623-461/+635
|\ \ \
| * | | nfsd4: fix connection allocation in sequence()J. Bruce Fields2010-10-241-14/+17
| * | | nfsd4: only require krb5 principal for NFSv4.0 callbacksJ. Bruce Fields2010-10-211-7/+8
| * | | nfsd4: move minorversion to clientJ. Bruce Fields2010-10-213-7/+15
| * | | nfsd4: delay session removal till free_clientJ. Bruce Fields2010-10-211-8/+13
| * | | nfsd4: separate callback change and callback probeJ. Bruce Fields2010-10-213-9/+16
| * | | nfsd4: callback program number is per-sessionJ. Bruce Fields2010-10-213-2/+5
| * | | nfsd4: track backchannel connectionsJ. Bruce Fields2010-10-211-4/+7
| * | | nfsd4: confirm only on succesful create_sessionJ. Bruce Fields2010-10-211-3/+5
| * | | nfsd4: make backchannel sequence number per-sessionJ. Bruce Fields2010-10-213-15/+17
| * | | nfsd4: use client pointer to backchannel sessionJ. Bruce Fields2010-10-213-8/+6
| * | | nfsd4: move callback setup into session init codeJ. Bruce Fields2010-10-212-15/+15
| * | | nfsd4: don't cache seq_misordered repliesJ. Bruce Fields2010-10-211-2/+1
| * | | nfsd4: expire clients more promptlyJ. Bruce Fields2010-10-111-1/+1
| * | | nfsd4: return expired on unfound stateid'sJ. Bruce Fields2010-10-021-2/+9
| * | | nfsd4: add new connections to sessionJ. Bruce Fields2010-10-011-2/+47
| * | | nfsd4: refactor connection allocationJ. Bruce Fields2010-10-011-6/+26
| * | | nfsd4: use callbacks on svc_xprt_deletionJ. Bruce Fields2010-10-012-9/+45
| * | | nfsd4: keep per-session list of connectionsJ. Bruce Fields2010-10-012-15/+62
| * | | nfsd4: clean up session allocationJ. Bruce Fields2010-10-011-122/+89
| * | | nfsd4: fix alloc_init_session return typeJ. Bruce Fields2010-10-011-3/+1
| * | | nfsd4: fix alloc_init_session BUILD_BUG_ON()J. Bruce Fields2010-10-011-1/+1
| * | | nfsd4: Move callback setup to callback queueJ. Bruce Fields2010-10-013-27/+63
| * | | nfsd4: remove separate cb_args structJ. Bruce Fields2010-10-012-30/+25
| * | | nfsd4: use generic callback code in null caseJ. Bruce Fields2010-10-013-15/+20
| * | | nfsd4: generic callback codeJ. Bruce Fields2010-10-012-39/+33
| * | | nfsd4: rename nfs4_rpc_args->nfsd4_cb_argsJ. Bruce Fields2010-10-012-9/+9
| * | | nfsd4: combine nfs4_rpc_args and nfsd4_cb_sequenceJ. Bruce Fields2010-10-012-23/+18
| * | | nfsd4: minor variable renaming (cb -> conn)J. Bruce Fields2010-10-012-22/+22
| * | | sunrpc: Add net to rpc_create_argsPavel Emelyanov2010-10-015-0/+6
| * | | sunrpc: Add net argument to svc_create_xprtPavel Emelyanov2010-10-014-7/+8
| * | | nfsd4: adjust buflen for encoded attrs bitmap based on actual bitmap lengthBenny Halevy2010-10-011-6/+12
| * | | sunrpc: Add net to pure API callsPavel Emelyanov2010-09-272-3/+3
| * | | nfsd: fix /proc/net/rpc/nfsd.export/content displayJ. Bruce Fields2010-09-261-11/+29
| * | | nfsd: Export get_task_comm for nfsdPavel Emelyanov2010-09-231-3/+1
| * | | nfsd: allow deprecated interface to be compiled out.NeilBrown2010-09-225-8/+43
| * | | nfsd: formally deprecate legacy nfsd syscall interfaceNeilBrown2010-09-221-0/+10
| * | | lockd: Mostly remove BKL from the serverBryan Schumaker2010-09-223-14/+21
| * | | nfsd/idmap: drop special request deferal in favour of improved default.NeilBrown2010-09-211-94/+11
| * | | nfsd: disable deferral for NFSv4NeilBrown2010-09-211-2/+5
| * | | Merge remote branch 'trond/bugfixes' into for-2.6.37J. Bruce Fields2010-09-1937-163/+613
| |\ \ \
| * | | | sunrpc: use seconds since boot in expiry cacheNeilBrown2010-09-072-4/+4
| * | | | sunrpc: extract some common sunrpc_cache code from nfsdNeilBrown2010-09-071-6/+3
| * | | | nfsd: remove duplicate NFS4_STATEID_SIZE declarationAndy Adamson2010-09-071-1/+0
* | | | | Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2010-10-2616-42/+2374
|\ \ \ \ \