summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2015-02-126-151/+209
|\
| * Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20J. Bruce Fields2015-02-0222-60/+123
| |\
| * | sunrpc/lockd: fix references to the BKLJeff Layton2015-01-232-4/+3
| * | svcrdma: Handle additional inline contentChuck Lever2015-01-151-0/+55
| * | svcrdma: Move read list XDR round-up logicChuck Lever2015-01-151-28/+9
| * | svcrdma: Support RDMA_NOMSG requestsChuck Lever2015-01-151-3/+36
| * | svcrdma: rc_position sanity checkingChuck Lever2015-01-151-4/+12
| * | svcrdma: Plant reader function in struct svcxprt_rdmaChuck Lever2015-01-152-44/+29
| * | svcrdma: Find rmsgp more reliablyChuck Lever2015-01-151-14/+4
| * | svcrdma: Scrub BUG_ON() and WARN_ON() call sitesChuck Lever2015-01-153-33/+49
| * | svcrdma: Clean up read chunk countingChuck Lever2015-01-152-19/+12
| * | svcrdma: Remove unused variableChuck Lever2015-01-151-2/+0
| * | svcrdma: Clean up dprintkChuck Lever2015-01-151-4/+4
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-02-112-26/+40
|\ \ \
| * | | cipso: don't use IPCB() to locate the CIPSO IP optionPaul Moore2015-02-112-26/+40
| | |/ | |/|
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-02-112-5/+3
|\ \ \
| * | | mm: gup: use get_user_pages_unlockedAndrea Arcangeli2015-02-111-4/+2
| * | | mm: page_counter: pull "-1" handling out of page_counter_memparse()Johannes Weiner2015-02-111-1/+1
* | | | Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2015-02-1110-517/+628
|\ \ \ \ | |/ / / |/| | |
| * | | SUNRPC: Cleanup to remove xs_tcp_close()Trond Myklebust2015-02-101-6/+1
| * | | SUNRPC: Fix stupid typo in xs_sock_set_reuseportTrond Myklebust2015-02-091-2/+3
| * | | SUNRPC: Define xs_tcp_fin_timeout only if CONFIG_SUNRPC_DEBUGTrond Myklebust2015-02-091-2/+2
| * | | SUNRPC: Handle connection reset more efficiently.Trond Myklebust2015-02-091-16/+18
| * | | SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flagTrond Myklebust2015-02-092-2/+0
| * | | SUNRPC: Make xs_tcp_close() do a socket shutdown rather than a sock_releaseTrond Myklebust2015-02-091-5/+1
| * | | SUNRPC: Ensure xs_tcp_shutdown() requests a full close of the connectionTrond Myklebust2015-02-091-2/+2
| * | | SUNRPC: Cleanup to remove remaining uses of XPRT_CONNECTION_ABORTTrond Myklebust2015-02-091-3/+0
| * | | SUNRPC: Remove TCP socket linger codeTrond Myklebust2015-02-091-35/+0
| * | | SUNRPC: Remove TCP client connection reset hackTrond Myklebust2015-02-081-66/+1
| * | | SUNRPC: TCP/UDP always close the old socket before reconnectingTrond Myklebust2015-02-081-2/+3
| * | | SUNRPC: Add helpers to prevent socket create from racingTrond Myklebust2015-02-082-6/+38
| * | | SUNRPC: Ensure xs_reset_transport() resets the close connection flagsTrond Myklebust2015-02-081-16/+13
| * | | SUNRPC: Do not clear the source port in xs_reset_transportTrond Myklebust2015-02-081-2/+0
| * | | SUNRPC: Handle EADDRINUSE on connectTrond Myklebust2015-02-082-0/+5
| * | | SUNRPC: Set SO_REUSEPORT socket option for TCP connectionsTrond Myklebust2015-02-081-4/+49
| * | | Merge tag 'nfs-rdma-for-3.20-part-2' of git://git.linux-nfs.org/projects/anna...Trond Myklebust2015-02-081-3/+4
| |\ \ \
| | * | | xprtrdma: Address sparse complaint in rpcr_to_rdmar()Chuck Lever2015-02-051-3/+4
| * | | | SUNRPC: NULL utsname dereference on NFS umount during namespace cleanupTrond Myklebust2015-02-032-7/+13
| * | | | Merge branch 'flexfiles'Trond Myklebust2015-02-031-7/+19
| |\ \ \ \
| | * | | | sunrpc: add rpc_count_iostats_idxWeston Andros Adamson2015-02-031-7/+19
| | | |/ / | | |/| |
| * | | | Merge tag 'nfs-rdma-for-3.20' of git://git.linux-nfs.org/projects/anna/nfs-rdmaTrond Myklebust2015-02-034-344/+468
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | xprtrdma: Update the GFP flags used in xprt_rdma_allocate()Chuck Lever2015-01-301-2/+5
| | * | | xprtrdma: Clean up after adding regbuf managementChuck Lever2015-01-302-11/+2
| | * | | xprtrdma: Allocate zero pad separately from rpcrdma_bufferChuck Lever2015-01-303-23/+13
| | * | | xprtrdma: Allocate RPC/RDMA receive buffer separately from struct rpcrdma_repChuck Lever2015-01-303-23/+23
| | * | | xprtrdma: Allocate RPC/RDMA send buffer separately from struct rpcrdma_reqChuck Lever2015-01-304-29/+19
| | * | | xprtrdma: Allocate RPC send buffer separately from struct rpcrdma_reqChuck Lever2015-01-304-104/+78
| | * | | xprtrdma: Add struct rpcrdma_regbuf and helpersChuck Lever2015-01-302-0/+98
| | * | | xprtrdma: Refactor rpcrdma_buffer_create() and rpcrdma_buffer_destroy()Chuck Lever2015-01-301-53/+95
| | * | | xprtrdma: Simplify synopsis of rpcrdma_buffer_create()Chuck Lever2015-01-303-7/+7
OpenPOWER on IntegriCloud