summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-10-1336-757/+756
|\
| * Merge Trond's bugfixesJ. Bruce Fields2012-10-113-8/+20
| |\
| * \ nfs: disintegrate UAPI for nfsJ. Bruce Fields2012-10-1011081-274876/+563270
| |\ \
| | * | UAPI: (Scripted) Disintegrate include/linux/sunrpcDavid Howells2012-10-094-39/+50
| | * | UAPI: (Scripted) Disintegrate include/linux/nfsdDavid Howells2012-10-0911-203/+246
| * | | nfsd4: don't allow reclaims of expired clientsJ. Bruce Fields2012-10-011-8/+10
| * | | nfsd4: remove redundant callback probeJ. Bruce Fields2012-10-011-3/+1
| * | | nfsd4: expire old client earlierJ. Bruce Fields2012-10-011-10/+7
| * | | nfsd4: separate session allocation and initializationJ. Bruce Fields2012-10-011-23/+23
| * | | nfsd4: clean up session allocationJ. Bruce Fields2012-10-011-12/+20
| * | | nfsd4: minor free_session cleanupJ. Bruce Fields2012-10-011-10/+9
| * | | nfsd4: new_conn_from_crses should only allocateJ. Bruce Fields2012-10-011-16/+10
| * | | nfsd4: separate connection allocation and initializationJ. Bruce Fields2012-10-011-10/+15
| * | | nfsd4: reject bad forechannel attrs earlierJ. Bruce Fields2012-10-011-4/+2
| * | | nfsd4: enforce per-client sessions/no-sessions distinctionJ. Bruce Fields2012-10-013-22/+31
| * | | nfsd4: set cl_minorversion at create timeJ. Bruce Fields2012-10-011-10/+1
| * | | nfsd4: don't pin clientids to pseudoflavorsJ. Bruce Fields2012-10-011-1/+17
| * | | nfsd4: fix bind_conn_to_session xdr commentJ. Bruce Fields2012-09-251-1/+1
| * | | nfsd4: cast readlink() bug argumentJ. Bruce Fields2012-09-101-1/+1
| * | | NFSD: pass null terminated buf to kstrtouint()Malahal Naineni2012-09-101-1/+1
| * | | nfsd: remove duplicate init in nfsd4_cb_recallNamjae Jeon2012-09-101-1/+0
| * | | nfsd4: eliminate redundant nfs4_free_stateidJ. Bruce Fields2012-09-101-6/+1
| * | | fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERRJulia Lawall2012-09-101-1/+1
| * | | nfsd: remove unused listener-removal interfacesJ. Bruce Fields2012-09-103-132/+0
| * | | nfsd4: fix nfs4 stateid leakJ. Bruce Fields2012-09-101-0/+1
| * | | nfsd: document kernel interfaces for nfsd configurationJ. Bruce Fields2012-08-211-0/+41
| * | | svcrpc: split up svc_handle_xprtJ. Bruce Fields2012-08-211-22/+25
| * | | svcrpc: break up svc_recvJ. Bruce Fields2012-08-211-36/+67
| * | | svcrpc: make svc_xprt_received staticJ. Bruce Fields2012-08-213-26/+20
| * | | svcrpc: remove handling of unknown errors from svc_recvJ. Bruce Fields2012-08-213-40/+5
| * | | svcrpc: make xpo_recvfrom return only >=0J. Bruce Fields2012-08-212-4/+4
| * | | svcrpc: don't bother checking bad svc_addr_len resultJ. Bruce Fields2012-08-212-4/+1
| * | | svcrpc: minor udp code cleanupJ. Bruce Fields2012-08-211-4/+5
| * | | nfsd: allow configuring nfsd to listen on 5-digit portsJ. Bruce Fields2012-08-211-1/+1
| * | | nfsd: remove redundant "port" argumentJ. Bruce Fields2012-08-213-9/+9
| * | | svcrpc: share some setup of listening socketsJ. Bruce Fields2012-08-213-11/+12
| * | | svcrpc: make svc_create_xprt enqueue on clearing XPT_BUSYJ. Bruce Fields2012-08-211-1/+1
| * | | svcrpc: clean up control flowJ. Bruce Fields2012-08-211-35/+34
| * | | svcrpc: standardize svc_setup_socket return conventionJ. Bruce Fields2012-08-211-18/+22
| * | | svcrpc: fix xpt_list traversal locking on shutdownJ. Bruce Fields2012-08-211-9/+15
| * | | knfsd: don't allocate file_locks on the stackJeff Layton2012-08-211-42/+76
| * | | knfsd: remove bogus BUG_ON() call from nfsd4_lockuJeff Layton2012-08-211-1/+0
| * | | nfsd4: nfsd_process_n_delegations should be staticJ. Bruce Fields2012-08-211-1/+1
| * | | NFSD: Swap the struct nfs4_operation getter and setterBryan Schumaker2012-08-211-2/+2
| * | | nfsd: do_nfsd_create verf argument is a u32J. Bruce Fields2012-08-211-1/+1
| * | | nfsd4: declare nfs4_recoverydir properlyJ. Bruce Fields2012-08-212-2/+2
| * | | nfsd4: nfsaclsvc_encode_voidres staticJ. Bruce Fields2012-08-211-2/+1
| * | | nfsd: trivial comment updatesJeff Layton2012-08-212-10/+1
| * | | vfs: don't treat fl_type as a bitmapJeff Layton2012-08-211-3/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-1351-296/+450
|\ \ \ \