summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2015-04-2720-105/+290
|\
| * netfilter; Add some missing default cases to switch statements in nft_reject.David S. Miller2015-04-272-0/+4
| * net: rfs: fix crash in get_rps_cpus()Eric Dumazet2015-04-261-6/+6
| * net: fix crash in build_skb()Eric Dumazet2015-04-252-13/+24
| * inet: fix possible panic in reqsk_queue_unlink()Eric Dumazet2015-04-247-9/+47
| * tcp: avoid looping in tcp_send_fin()Eric Dumazet2015-04-241-21/+29
| * net: unix: garbage: fixed several comment and whitespace style issuesJason Eastman2015-04-231-42/+28
| * tipc: fix node refcount issueErik Hugne2015-04-231-1/+0
| * tipc: fix random link reset problemErik Hugne2015-04-231-1/+2
| * tipc: fix topology server broken issueYing Xue2015-04-231-6/+3
| * net: do not deplete pfmemalloc reserveEric Dumazet2015-04-221-2/+7
| * ip6_gre: use netdev_alloc_pcpu_stats()Johannes Berg2015-04-221-8/+1
| * mpls: Prevent use of implicit NULL label as outgoing labelRobert Shearman2015-04-221-0/+9
| * mpls: Per-device enabling of packet inputRobert Shearman2015-04-222-2/+69
| * mpls: Per-device MPLS stateRobert Shearman2015-04-222-2/+51
| * tcp: fix possible deadlock in tcp_send_fin()Eric Dumazet2015-04-221-1/+19
* | 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
OpenPOWER on IntegriCloud