summaryrefslogtreecommitdiff
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2015-04-2610-732/+889
|\
| * Merge tag 'nfs-rdma-for-4.1-1' of git://git.linux-nfs.org/projects/anna/nfs-rdmaTrond Myklebust2015-04-2360-914/+1294
| |\
| | * xprtrdma: Make rpcrdma_{un}map_one() into inline functionsChuck Lever2015-03-315-46/+73
| | * xprtrdma: Handle non-SEND completions via a calloutChuck Lever2015-03-313-10/+28
| | * xprtrdma: Add "open" memreg opChuck Lever2015-03-315-46/+70
| | * xprtrdma: Add "destroy MRs" memreg opChuck Lever2015-03-315-51/+40
| | * xprtrdma: Add "reset MRs" memreg opChuck Lever2015-03-315-101/+83
| | * xprtrdma: Add "init MRs" memreg opChuck Lever2015-03-315-101/+119
| | * xprtrdma: Add a "deregister_external" op for each memreg modeChuck Lever2015-03-317-90/+84
| | * xprtrdma: Add a "register_external" op for each memreg modeChuck Lever2015-03-316-169/+160
| | * xprtrdma: Add a "max_payload" op for each memreg modeChuck Lever2015-03-316-36/+59
| | * xprtrdma: Add vector of ops for each memory registration strategyChuck Lever2015-03-316-5/+89
| | * xprtrdma: Prevent infinite loop in rpcrdma_ep_create()Chuck Lever2015-03-311-2/+3
| | * xprtrdma: Byte-align FRWR registrationChuck Lever2015-03-311-8/+4
| | * xprtrdma: Perform a full marshal on retransmitChuck Lever2015-03-313-52/+34
| | * xprtrdma: Display IPv6 addresses and port numbers correctlyChuck Lever2015-03-312-21/+47
| * | Merge branch 'bugfixes'Trond Myklebust2015-04-231-10/+12
| |\ \
| | * | SUNRPC: Fix a regression when reconnectingTrond Myklebust2015-03-271-10/+12
| * | | sunrpc: make debugfs file creation failure non-fatalJeff Layton2015-04-234-38/+32
| * | | SUNRPC: fix build-warning due to format missmatchNicholas Mc Guire2015-03-131-2/+2
| * | | SUNRPC: use jiffies_to_msecs for converting jiffiesNicholas Mc Guire2015-03-121-1/+1
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2015-04-264-24/+24
|\ \ \
| * | | VFS: net/: d_inode() annotationsDavid Howells2015-04-152-19/+19
| * | | VFS: net/unix: d_backing_inode() annotationsDavid Howells2015-04-152-4/+4
| * | | VFS: AF_UNIX sockets should call mknod on the top layer onlyDavid Howells2015-04-151-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2015-04-227-17/+392
|\ \ \ \
| * | | | crush: straw2 bucket type with an efficient 64-bit crush_ln()Ilya Dryomov2015-04-224-0/+306
| * | | | crush: ensuring at most num-rep osds are selectedIlya Dryomov2015-04-221-4/+12
| * | | | crush: drop unnecessary include from mapper.cIlya Dryomov2015-04-221-1/+0
| * | | | libceph: expose client options through debugfsIlya Dryomov2015-04-201-0/+24
| * | | | libceph, ceph: split ceph_show_options()Ilya Dryomov2015-04-201-0/+37
| * | | | libceph: don't overwrite specific con error msgsIlya Dryomov2015-04-201-12/+13
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-213-1/+8
|\ \ \ \ \
| * | | | | tcp: add memory barriers to write space pathsjbaron@akamai.com2015-04-212-1/+5
| * | | | | ip_forward: Drop frames with attached skb->skSebastian Pöhn2015-04-201-0/+3
* | | | | | Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2015-04-184-14/+52
|\ \ \ \ \ \
| * | | | | | net/9p: add a privport option for RDMA transport.Dominique Martinet2015-03-211-8/+44
| * | | | | | net/9p: Initialize opts->privport as it should be.Dominique Martinet2015-03-211-0/+1
| * | | | | | net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()Andrey Ryabinin2015-03-201-1/+4
| * | | | | | 9p: use unsigned integers for nwqid/countKirill A. Shutemov2015-03-201-3/+3
| * | | | | | 9p: remove unused variable in p9_fd_create()Fabian Frederick2015-03-201-2/+0
* | | | | | | Bluetooth: hidp: Fix regression with older userspace and flags validationMarcel Holtmann2015-04-181-1/+2
| |/ / / / / |/| | | | |
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-1716-42/+91
|\ \ \ \ \ \
| * | | | | | net: dsa: use DEVICE_ATTR_RW to declare temp1_maxVivien Didelot2015-04-171-3/+3
| * | | | | | net: remove unused 'dev' argument from netif_needs_gso()Johannes Berg2015-04-171-1/+1
| * | | | | | act_mirred: Fix bogus header when redirecting from VLANHerbert Xu2015-04-171-1/+1
| * | | | | | inet_diag: fix access to tcp cc informationEric Dumazet2015-04-176-17/+35
| * | | | | | tcp: tcp_get_info() should fetch socket fields onceEric Dumazet2015-04-171-4/+6
| * | | | | | skbuff: Do not scrub skb mark within the same name spaceHerbert Xu2015-04-161-3/+6
| * | | | | | Revert "net: Reset secmark when scrubbing packet"Herbert Xu2015-04-161-1/+0