summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2013-07-1120-182/+512
|\
| * nfsd4: support minorversion 1 by defaultJ. Bruce Fields2013-07-081-1/+1
| * nfsd4: allow destroy_session over destroyed sessionJ. Bruce Fields2013-07-082-10/+19
| * svcrpc: fix failures to handle -1 uid'sJ. Bruce Fields2013-07-081-2/+0
| * sunrpc: Don't schedule an upcall on a replaced cache entry.NeilBrown2013-07-011-1/+2
| * net/sunrpc: xpt_auth_cache should be ignored when expired.NeilBrown2013-07-013-35/+23
| * sunrpc/cache: ensure items removed from cache do not have pending upcalls.NeilBrown2013-07-012-1/+6
| * sunrpc/cache: use cache_fresh_unlocked consistently and correctly.NeilBrown2013-07-011-13/+7
| * sunrpc/cache: remove races with queuing an upcall.NeilBrown2013-07-011-11/+29
| * nfsd4: return delegation immediately if lease failsJ. Bruce Fields2013-07-011-1/+3
| * nfsd4: do not throw away 4.1 lock state on last unlockJ. Bruce Fields2013-07-011-8/+1
| * nfsd4: delegation-based open reclaims should bypass permissionsJ. Bruce Fields2013-07-011-1/+2
| * svcrpc: don't error out on small tcp fragmentJ. Bruce Fields2013-07-011-1/+1
| * svcrpc: fix handling of too-short rpc'sJ. Bruce Fields2013-07-011-2/+7
| * nfsd4: minor read_buf cleanupJ. Bruce Fields2013-07-011-10/+14
| * nfsd4: fix decoding of compounds across page boundariesJ. Bruce Fields2013-07-011-1/+1
| * nfsd4: clean up nfs4_open_delegationJ. Bruce Fields2013-07-011-44/+34
| * NFSD: Don't give out read delegations on createsSteve Dickson2013-07-011-0/+9
| * nfsd4: allow client to send no cb_sec flavorsJ. Bruce Fields2013-07-011-1/+5
| * nfsd4: fail attempts to request gss on the backchannelJ. Bruce Fields2013-07-011-0/+25
| * nfsd4: implement minimal SP4_MACH_CREDJ. Bruce Fields2013-07-013-12/+87
| * svcrpc: store gss mech in svc_credJ. Bruce Fields2013-07-015-4/+14
| * svcrpc: introduce init_svc_credJ. Bruce Fields2013-07-012-4/+9
| * Merge branch 'for-3.10' into 'for-3.11'J. Bruce Fields2013-07-012-8/+12
| |\
| * | nfsd: avoid undefined signed overflowJim Rees2013-05-211-1/+1
| * | sunrpc: the cache_detail in cache_is_valid is unused any morechaoting fan2013-05-211-4/+4
| * | nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL caseJ. Bruce Fields2013-05-151-1/+3
| * | sunrpc: server back channel needs no rpcbind methodJ. Bruce Fields2013-05-151-1/+0
| * | NFSD: Server implementation of MAC LabelingDavid Quigley2013-05-157-10/+207
| * | NFSDv4.2: Add NFS v4.2 support to the NFS serverSteve Dickson2013-05-132-1/+2
| * | security: cap_inode_getsecctx returning garbageJ. Bruce Fields2013-05-131-1/+1
| * | nfsd4: store correct client minorversion for >=4.2J. Bruce Fields2013-05-131-1/+1
| * | nfsd: get rid of the unused functions in vfsZhao Hongjiang2013-05-131-5/+0
* | | Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2013-07-1118-272/+694
|\ \ \
| * | | tracing: Make tracing_open_generic_{tr,tc}() staticSteven Rostedt (Red Hat)2013-07-021-2/+2
| * | | tracing: Remove ftrace() functionzhangwei(Jovi)2013-07-022-14/+0
| * | | tracing: Remove TRACE_EVENT_TYPE enum definitionzhangwei(Jovi)2013-07-021-6/+0
| * | | tracing: Make tracer_tracing_{off,on,is_on}() staticSteven Rostedt (Red Hat)2013-07-021-3/+3
| * | | tracing: Fix irqs-off tag display in syscall tracingzhangwei(Jovi)2013-07-021-4/+17
| * | | uprobes: Fix return value in error handling pathzhangwei(Jovi)2013-07-021-1/+3
| * | | tracing: Fix race between deleting buffer and setting eventsSteven Rostedt (Red Hat)2013-07-021-6/+17
| * | | tracing: Add trace_array_get/put() to event handlingSteven Rostedt (Red Hat)2013-07-022-4/+54
| * | | tracing: Get trace_array ref counts when accessing trace filesSteven Rostedt (Red Hat)2013-07-021-9/+112
| * | | tracing: Add trace_array_get/put() to handle instance refs betterSteven Rostedt (Red Hat)2013-07-021-18/+65
| * | | tracing: Protect ftrace_trace_arrays list in trace_events.cAlexander Z Lam2013-07-013-2/+13
| * | | tracing: Make trace_marker use the correct per-instance bufferAlexander Z Lam2013-07-011-1/+2
| * | | ftrace: Do not run selftest if command line parameter is setSteven Rostedt (Red Hat)2013-07-013-2/+22
| * | | tracing/kprobes: Don't pass addr=ip to perf_trace_buf_submit()Oleg Nesterov2013-07-011-4/+2
| * | | tracing: Use flag buffer_disabled for irqsoff tracerSteven Rostedt (Red Hat)2013-07-012-33/+72
| * | | tracing/kprobes: Turn trace_probe->files into list_headOleg Nesterov2013-07-011-101/+37
OpenPOWER on IntegriCloud