summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-3.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-06-107-607/+409
|\
| * xprtrdma: Disconnect on registration failureChuck Lever2014-06-042-23/+42
| * xprtrdma: Remove BUG_ON() call sitesChuck Lever2014-06-042-9/+12
| * xprtrdma: Avoid deadlock when credit window is resetChuck Lever2014-06-043-19/+7
| * SUNRPC: Move congestion window constants to header fileChuck Lever2014-06-041-19/+9
| * xprtrdma: Reset connection timeout after successful reconnectChuck Lever2014-06-041-0/+1
| * xprtrdma: Use macros for reconnection timeout constantsChuck Lever2014-06-041-7/+12
| * xprtrdma: Allocate missing pagelistShirley Ma2014-06-041-0/+6
| * xprtrdma: Remove Tavor MTU settingChuck Lever2014-06-041-14/+0
| * xprtrdma: Ensure ia->ri_id->qp is not NULL when reconnectingChuck Lever2014-06-041-9/+20
| * xprtrdma: Reduce the number of hardway buffer allocationsChuck Lever2014-06-041-12/+13
| * xprtrdma: Limit work done by completion handlerChuck Lever2014-06-042-4/+7
| * xprtrmda: Reduce calls to ib_poll_cq() in completion handlersChuck Lever2014-06-042-18/+42
| * xprtrmda: Reduce lock contention in completion handlersChuck Lever2014-06-041-4/+10
| * xprtrdma: Split the completion queueChuck Lever2014-06-042-92/+137
| * xprtrdma: Make rpcrdma_ep_destroy() return voidChuck Lever2014-06-043-13/+4
| * xprtrdma: Simplify rpcrdma_deregister_external() synopsisChuck Lever2014-06-044-10/+4
| * xprtrdma: mount reports "Invalid mount option" if memreg mode not supportedChuck Lever2014-06-041-4/+4
| * xprtrdma: Fall back to MTHCAFMR when FRMR is not supportedChuck Lever2014-06-041-16/+15
| * xprtrdma: Remove REGISTER memory registration modeChuck Lever2014-06-042-88/+5
| * xprtrdma: Remove MEMWINDOWS registration modesChuck Lever2014-06-044-203/+7
| * xprtrdma: Remove BOUNCEBUFFERS memory registration modeChuck Lever2014-06-043-28/+1
| * xprtrdma: RPC/RDMA must invoke xprt_wake_pending_tasks() in process contextChuck Lever2014-06-043-7/+21
| * nfs-rdma: Fix for FMR leaksAllen Andrews2014-06-041-35/+38
| * xprtrdma: mind the device's max fast register page list depthSteve Wise2014-06-043-16/+36
| * net, sunrpc: suppress allocation warning in rpc_malloc()David Rientjes2014-05-291-2/+3
| * SUNRPC: Fix a module reference issue in rpcsec_gssTrond Myklebust2014-05-181-3/+1
* | Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2014-06-1010-610/+547
|\ \
| * | svcrdma: Fence LOCAL_INV work requestsSteve Wise2014-06-061-1/+1
| * | svcrdma: refactor marshalling logicSteve Wise2014-06-063-604/+331
| * | nfsd4: simplify server xdr->next_page useJ. Bruce Fields2014-06-061-4/+5
| * | SUNRPC/NFSD: Remove using of dprintk with KERN_WARNINGKinglong Mee2014-05-301-2/+1
| * | nfsd4: better reservation of head space for krb5J. Bruce Fields2014-05-302-0/+4
| * | rpc: define xdr_restrict_buflenJ. Bruce Fields2014-05-301-0/+29
| * | nfsd4: allow encoding across page boundariesJ. Bruce Fields2014-05-302-2/+77
| * | rpc: xdr_truncate_encodeJ. Bruce Fields2014-05-301-0/+66
| * | SUNRPC: track whether a request is coming from a loop-back interface.NeilBrown2014-05-222-0/+18
| * | SUNRPC: Fix a module reference leak in svc_handle_xprtTrond Myklebust2014-05-221-0/+2
| * | NFSD: Ignore client's source port on RDMA transportsChuck Lever2014-05-223-1/+17
| * | SUNRPC: Fix printk that is not only for nfsdKinglong Mee2014-05-081-1/+1
| |/
* | Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-06-093-22/+25
|\ \
| * | cgroup: remove css_parent()Tejun Heo2014-05-162-2/+2
| * | cgroup: replace cftype->trigger() with cftype->write()Tejun Heo2014-05-131-7/+8
| * | cgroup: replace cftype->write_string() with cftype->write()Tejun Heo2014-05-132-13/+15
* | | Merge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/ke...Linus Torvalds2014-06-081-5/+17
|\ \ \
| * | | net: netfilter: LLVMLinux: vlais-netfilterMark Charlebois2014-06-071-5/+17
* | | | Merge branch 'next' (accumulated 3.16 merge window patches) into masterLinus Torvalds2014-06-0817-36/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2014-06-0317-36/+34
| |\ \ \
| | * | | arch: Mass conversion of smp_mb__*()Peter Zijlstra2014-04-1817-36/+34
* | | | | net: filter: fix possible memory leak in __sk_prepare_filter()Leon Yu2014-06-021-1/+6