summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-4.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2018-01-3012-676/+666
|\
| * Merge tag 'nfs-rdma-for-4.16-1' of git://git.linux-nfs.org/projects/anna/linu...Trond Myklebust2018-01-2310-654/+636
| |\
| | * SUNRPC: Micro-optimize __rpc_executeChuck Lever2018-01-231-13/+11
| | * SUNRPC: task_run_action should display tk_callbackChuck Lever2018-01-231-1/+1
| | * SUNRPC: Trace xprt_timer eventsChuck Lever2018-01-232-3/+1
| | * xprtrdma: Correct some documenting commentsChuck Lever2018-01-232-2/+2
| | * xprtrdma: Fix "bytes registered" accountingChuck Lever2018-01-231-2/+2
| | * xprtrdma: Instrument allocation/release of rpcrdma_req/rep objectsChuck Lever2018-01-232-9/+7
| | * xprtrdma: Add trace points to instrument QP and CQ access upcallsChuck Lever2018-01-231-0/+3
| | * xprtrdma: Add trace points in the client-side backchannel code pathsChuck Lever2018-01-232-5/+5
| | * xprtrdma: Add trace points for connect eventsChuck Lever2018-01-232-28/+17
| | * xprtrdma: Add trace points to instrument MR allocation and recoveryChuck Lever2018-01-231-3/+3
| | * xprtrdma: Add trace points to instrument memory invalidationChuck Lever2018-01-233-16/+16
| | * xprtrdma: Add trace points in reply decoder pathChuck Lever2018-01-231-20/+9
| | * xprtrdma: Add trace points to instrument memory registrationChuck Lever2018-01-232-22/+7
| | * xprtrdma: Add trace points in the RPC Reply handler pathsChuck Lever2018-01-232-19/+9
| | * xprtrdma: Add trace points in RPC Call transmit pathsChuck Lever2018-01-232-15/+5
| | * rpcrdma: infrastructure for static trace points in rpcrdma.koChuck Lever2018-01-232-5/+9
| | * xprtrdma: Introduce rpcrdma_mw_unmap_and_putChuck Lever2018-01-164-23/+33
| | * xprtrdma: Remove usage of "mw"Chuck Lever2018-01-165-278/+292
| | * xprtrdma: Replace all usage of "frmr" with "frwr"Chuck Lever2018-01-164-99/+99
| | * xprtrdma: Don't clear RPC_BC_PA_IN_USE on pre-allocated rpc_rqst'sChuck Lever2018-01-161-6/+1
| | * xprtrdma: Split xprt_rdma_send_requestChuck Lever2018-01-164-32/+50
| | * xprtrdma: buf_free not called for CB repliesChuck Lever2018-01-163-6/+1
| | * xprtrdma: Move unmap-safe logic to rpcrdma_marshal_reqChuck Lever2018-01-162-5/+11
| | * xprtrdma: Support IPv6 in xprt_rdma_set_portChuck Lever2018-01-161-4/+24
| | * xprtrdma: Remove another sockaddr_storage field (cdata::addr)Chuck Lever2018-01-163-19/+12
| | * xprtrdma: Initialize the xprt address string array earlierChuck Lever2018-01-163-13/+21
| | * xprtrdma: Remove unused padding variablesChuck Lever2018-01-162-7/+3
| | * xprtrdma: Remove ri_reminv_expectedChuck Lever2018-01-162-3/+0
| | * xprtrdma: Per-mode handling for Remote InvalidationChuck Lever2018-01-164-30/+27
| | * xprtrdma: Eliminate unnecessary lock cycle in xprt_rdma_send_requestChuck Lever2018-01-161-1/+1
| | * xprtrdma: Fix backchannel allocation of extra rpcrdma_repsChuck Lever2018-01-163-24/+22
| | * xprtrdma: Fix buffer leak after transport set up failureChuck Lever2018-01-161-11/+2
| * | SUNRPC: Add explicit rescheduling points in the receive pathTrond Myklebust2018-01-141-2/+19
| * | SUNRPC: Chunk reading of replies from the serverTrond Myklebust2018-01-141-4/+11
| * | SUNRPC: Remove rpc_protocol()Chuck Lever2018-01-141-16/+0
* | | Merge branch 'work.sock_recvmsg' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2018-01-304-18/+17
|\ \ \
| * | | tipc: switch to sock_recvmsg()Al Viro2017-12-021-2/+2
| * | | smc: switch to sock_recvmsg()Al Viro2017-12-021-8/+10
| * | | ipvs: switch to sock_recvmsg()Al Viro2017-12-021-6/+3
| * | | svc_recvfrom(): switch to sock_recvmsg()Al Viro2017-12-021-2/+2
* | | | Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-01-3030-97/+96
|\ \ \ \
| * | | | 9p: untangle ->poll() messAl Viro2017-11-281-30/+30
| * | | | net: annotate ->poll() instancesAl Viro2017-11-2729-61/+62
| * | | | annotate poll-related wait keysAl Viro2017-11-272-4/+2
| * | | | anntotate the places where ->poll() return values goAl Viro2017-11-272-2/+2
| |/ / /
* | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2018-01-304-19/+4
|\ \ \ \
| * \ \ \ Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau...Ingo Molnar2018-01-034-19/+4
| |\ \ \ \
| | | \ \ \
| | | \ \ \
| | *-. \ \ \ Merge branches 'cond_resched.2017.12.04a', 'dyntick.2017.11.28a', 'fixes.2017...Paul E. McKenney2017-12-113-18/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
OpenPOWER on IntegriCloud