summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-12-165-74/+223
|\
| * NFSv4: Fix a regression in the NFSv4 state managerTrond Myklebust2009-12-151-3/+2
| * NFSv4: Release the sequence id before restarting a CLOSE rpc callTrond Myklebust2009-12-153-6/+11
| * nfs41: fix session fore channel negotiationAndy Adamson2009-12-151-2/+10
| * nfs41: do not zero seqid portion of stateid on closeAndy Adamson2009-12-151-2/+0
| * nfs: run state manager in privileged modeAlexandros Batsakis2009-12-152-21/+16
| * nfs: make recovery state manager operations privilegedAlexandros Batsakis2009-12-151-18/+97
| * nfs: enforce FIFO ordering of operations trying to acquire slotAlexandros Batsakis2009-12-153-6/+35
| * rpc: add a new priority in RPC taskAlexandros Batsakis2009-12-151-1/+12
| * nfs: remove rpc_task argument from nfs4_find_slotAlexandros Batsakis2009-12-151-2/+2
| * rpc: add rpc_queue_empty functionAlexandros Batsakis2009-12-152-0/+15
| * nfs: change nfs4_do_setlk params to identify recovery typeAlexandros Batsakis2009-12-152-7/+11
| * nfs: do not do a LOOKUP after openAlexandros Batsakis2009-12-151-3/+0
| * nfs: minor cleanup of session drainingAlexandros Batsakis2009-12-151-9/+18
* | Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Linus Torvalds2009-12-1621-236/+75
|\ \
| * | modpost: fix segfault with short symbol namesMichal Marek2009-12-151-2/+2
| * | module: handle ppc64 relocating kcrctabs when CONFIG_RELOCATABLE=yRusty Russell2009-12-153-7/+29
| * | Kbuild: clear marker out of modpostWenji Huang2009-12-152-167/+0
| * | module: make MODULE_SYMBOL_PREFIX into a CONFIG optionAlan Jenkins2009-12-1512-21/+33
| * | ARM: unexport symbols used to implement floating point emulationAlan Jenkins2009-12-151-20/+0
| * | ARM: use unified discard definition in linker scriptAlan Jenkins2009-12-151-5/+8
| * | x86: don't export inline functionRusty Russell2009-12-151-1/+3
| * | sparc64: don't export static inline pci_ functionsStephen Rothwell2009-12-152-13/+0
| |/
* | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/...Linus Torvalds2009-12-166-18/+50
|\ \
| * | [IA64] implement early_io{re,un}map for ia64Luck, Tony2009-12-142-0/+13
| * | [IA64] Replace old style lock initializerThomas Gleixner2009-12-141-1/+1
| * | [IA64] fix SBA IOMMU to handle allocation failure properlyFUJITA Tomonori2009-12-141-9/+29
| * | [IA64] Save I-resources to ia64_sal_os_stateTakao Indoh2009-12-142-3/+13
| * | [IA64] preallocate IA64_IRQ_MOVE_VECTORKenji Kaneshige2009-12-142-5/+7
| |/
* | Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2009-12-1663-863/+719
|\ \
| * | nfsd: remove pointless paths in file headersJ. Bruce Fields2009-12-1527-61/+2
| * | nfsd: move most of nfsfh.h to fs/nfsdJ. Bruce Fields2009-12-156-199/+213
| * | nfsd: remove unused field rq_reffhJ. Bruce Fields2009-12-151-4/+0
| * | nfsd: enable V4ROOT exportsJ. Bruce Fields2009-12-151-1/+1
| * | nfsd: make V4ROOT exports read-onlyJ. Bruce Fields2009-12-151-4/+11
| * | nfsd: restrict filehandles accepted in V4ROOT caseSteve Dickson2009-12-153-6/+39
| * | nfsd: allow exports of symlinksJ. Bruce Fields2009-12-151-2/+4
| * | nfsd: filter readdir results in V4ROOT caseJ. Bruce Fields2009-12-153-4/+9
| * | nfsd: filter lookup results in V4ROOT caseJ. Bruce Fields2009-12-151-1/+14
| * | nfsd4: don't continue "under" mounts in V4ROOT caseJ. Bruce Fields2009-12-151-2/+10
| * | nfsd: introduce export flag for v4 pseudorootSteve Dickson2009-12-152-0/+11
| * | nfsd: let "insecure" flag vary by pseudoflavorJ. Bruce Fields2009-12-142-3/+5
| * | nfsd: new interface to advertise export featuresJ. Bruce Fields2009-12-142-1/+23
| * | nfsd: Move private headers to source directoryBoaz Harrosh2009-12-1426-44/+52
| * | vfs: nfsctl.c un-used nfsd #includesBoaz Harrosh2009-12-141-2/+0
| * | lockd: Remove un-used nfsd headers #includesBoaz Harrosh2009-12-142-8/+0
| * | s390: remove un-used nfsd #includesBoaz Harrosh2009-12-142-10/+0
| * | sparc: remove un-used nfsd #includesBoaz Harrosh2009-12-141-5/+0
| * | parsic: remove un-used nfsd #includesBoaz Harrosh2009-12-141-6/+0
| * | compat.c: Remove dependence on nfsd private headersBoaz Harrosh2009-12-141-2/+0
OpenPOWER on IntegriCloud