aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'listen_refactor_part_13'David S. Miller2015-03-18
|\
| * inet: request sock should init IPv6/IPv4 addressesEric Dumazet2015-03-18
| * inet: get rid of last __inet_hash_connect() argumentEric Dumazet2015-03-18
| * ipv6: get rid of __inet6_hash()Eric Dumazet2015-03-18
| * inet: add IPv6 support to sk_ehashfn()Eric Dumazet2015-03-18
| * net: introduce sk_ehashfn() helperEric Dumazet2015-03-18
| * netns: constify net_hash_mix() and various callersEric Dumazet2015-03-18
|/
* Merge branch 'txq_max_rate'David S. Miller2015-03-18
|\
| * net/mlx4_en: Add tx queue maxrate supportOr Gerlitz2015-03-18
| * net/mlx4_core: Add basic support for QP max-rate limitingOr Gerlitz2015-03-18
| * net: Add max rate tx queue attributeJohn Fastabend2015-03-18
|/
* Merge branch 'rhashtable_remove_shift'David S. Miller2015-03-18
|\
| * rhashtable: Remove max_shift and min_shiftHerbert Xu2015-03-18
| * test_rhashtable: Use rhashtable max_size instead of max_shiftHerbert Xu2015-03-18
| * tipc: Use rhashtable max/min_size instead of max/min_shiftHerbert Xu2015-03-18
| * netlink: Use rhashtable max_size instead of max_shiftHerbert Xu2015-03-18
| * rhashtable: Introduce max_size/min_sizeHerbert Xu2015-03-18
| * rhashtable: Remove shift from bucket_tableHerbert Xu2015-03-18
|/
* Merge branch 'xgene-next'David S. Miller2015-03-18
|\
| * drivers: net: xgene: Add second SGMII based 1G interfaceKeyur Chudgar2015-03-18
| * dtb: xgene: Add second SGMII based 1G interface nodeKeyur Chudgar2015-03-18
| * Documentation: dtb: Add port-id field for APM X-Gene ethernetKeyur Chudgar2015-03-18
|/
* Merge branch 'tipc_netns_leak'David S. Miller2015-03-17
|\
| * tipc: withdraw tipc topology server name when namespace is deletedYing Xue2015-03-17
| * tipc: fix a potential deadlock when nametable is purgedYing Xue2015-03-17
| * tipc: fix netns refcnt leakYing Xue2015-03-17
|/
* Merge branch 'listener_refactor_part_12'David S. Miller2015-03-17
|\
| * inet: fix request sock refcountingEric Dumazet2015-03-17
| * inet: avoid fastopen lock for regular accept()Eric Dumazet2015-03-17
| * tcp: rename struct tcp_request_sock listenerEric Dumazet2015-03-17
| * inet: add rsk_listener field to struct request_sockEric Dumazet2015-03-17
| * inet: uninline inet_reqsk_alloc()Eric Dumazet2015-03-17
| * inet: add sk_listener argument to inet_reqsk_alloc()Eric Dumazet2015-03-17
|/
* Merge branch 'listener_refactor_part_11'David S. Miller2015-03-17
|\
| * tcp: uninline tcp_oow_rate_limited()Eric Dumazet2015-03-17
| * tcp: move tcp_openreq_init() to tcp_input.cEric Dumazet2015-03-17
| * inet: move ir_mark to fill a holeEric Dumazet2015-03-17
| * netfilter: xt_socket: prepare for TCP_NEW_SYN_RECV supportEric Dumazet2015-03-17
| * netfilter: tproxy: prepare TCP_NEW_SYN_RECV supportEric Dumazet2015-03-17
| * netfilter: use sk_fullsock() helperEric Dumazet2015-03-17
|/
* bpf: allow BPF programs access 'protocol' and 'vlan_tci' fieldsAlexei Starovoitov2015-03-17
* Merge branch 'const_of_device_id'David S. Miller2015-03-17
|\
| * via-velocity: constify of_device_id arrayFabian Frederick2015-03-17
| * net: via-rhine: constify of_device_id arrayFabian Frederick2015-03-17
| * ehea: constify of_device_id arrayFabian Frederick2015-03-17
| * IBM-EMAC: constify of_device_id arrayFabian Frederick2015-03-17
| * can: constify of_device_id arrayFabian Frederick2015-03-17
| * net: phy: constify of_device_id arrayFabian Frederick2015-03-17
| * orinoco: constify of_device_id arrayFabian Frederick2015-03-17
| * net: xilinx: constify of_device_id arrayFabian Frederick2015-03-17