summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-m...David S. Miller2016-07-0126-192/+704
|\
| * batman-adv: Add debugfs table for mcast flagsLinus Lüssing2016-06-303-0/+130
| * batman-adv: Adding logging of mcast flag changesLinus Lüssing2016-06-304-3/+142
| * batman-adv: Add multicast optimization support for bridged setupsLinus Lüssing2016-06-303-19/+177
| * batman-adv: Always flood IGMP/MLD reportsLinus Lüssing2016-06-302-14/+75
| * batman-adv: Include frame priority in fragment headerAndrew Lunn2016-06-303-2/+16
| * batman-adv: Set skb priority in fragmentsAndrew Lunn2016-06-301-2/+1
| * batman-adv: init ELP tweaking options only onceMarek Lindner2016-06-304-7/+23
| * batman-adv: move GW mode and selection class to private data structureAntonio Quartulli2016-06-305-21/+21
| * batman-adv: remove useless inline attribute for sysfs helper functionAntonio Quartulli2016-06-301-6/+6
| * batman-adv: remove ogm_emit and ogm_schedule API callsAntonio Quartulli2016-06-307-86/+67
| * batman-adv: remove unused callback from batadv_algo_ops structMarek Lindner2016-06-302-8/+0
| * batman-adv: refactor batadv_neigh_node_* functions to follow common styleMarek Lindner2016-06-305-13/+38
| * batman-adv: update elp interval documentationMarek Lindner2016-06-301-1/+1
| * batman-adv: document sysfs files in alphabetical orderMarek Lindner2016-06-301-9/+9
| * batman-adv: remove unused vid local variable in tt seq printSimon Wunderlich2016-06-301-2/+0
| * batman-adv: statically print gateway table headerAntonio Quartulli2016-06-301-2/+1
| * batman-adv: Start new development cycleSimon Wunderlich2016-06-301-1/+1
* | Merge branch 'hns-next'David S. Miller2016-07-0110-69/+158
|\ \
| * | net: hns: get reset registers from DTKejian Yan2016-07-011-14/+66
| * | net: hns: add media-type property for hnsKejian Yan2016-07-015-3/+48
| * | net: hns: remove redundant hns_mac_dev_to_enet_if()Kejian Yan2016-07-011-15/+0
| * | net: hns: normalize two different loopDaode Huang2016-07-011-9/+9
| * | net: hns: add a space before "*/"Daode Huang2016-07-011-2/+2
| * | net: hns: delete redundant parentheseDaode Huang2016-07-011-2/+2
| * | net: hns: change code style from a = a + x to a += xDaode Huang2016-07-011-16/+16
| * | net: hns: fix code style about hns driverDaode Huang2016-07-011-9/+7
| * | MAINTAINERS: add maintainers for hns driverDaode Huang2016-07-011-0/+9
|/ /
* | Merge branch 'rds-multipath-datastructures'David S. Miller2016-07-0117-174/+211
|\ \
| * | RDS: Do not send a pong to an incoming ping with 0 src portSowmini Varadhan2016-07-011-0/+4
| * | RDS: TCP: Simplify reconnect to avoid duelling reconnnect attemptsSowmini Varadhan2016-07-012-3/+6
| * | RDS: TCP: Hooks to set up a single connection pathSowmini Varadhan2016-07-019-17/+20
| * | RDS: TCP: make receive path use the rds_conn_pathSowmini Varadhan2016-07-019-22/+26
| * | RDS: TCP: make ->sk_user_data point to a rds_conn_pathSowmini Varadhan2016-07-016-40/+41
| * | RDS: TCP: Refactor connection destruction to handle multiple pathsSowmini Varadhan2016-07-011-7/+39
| * | RDS: TCP: Make rds_tcp_connection track the rds_conn_pathSowmini Varadhan2016-07-015-42/+48
| * | RDS: TCP: Remove dead logic around c_passive in rds-tcpSowmini Varadhan2016-07-011-6/+1
| * | RDS: Rework path specific indirectionsSowmini Varadhan2016-07-0112-40/+29
|/ /
* | Merge branch 'bpf-cgroup2'David S. Miller2016-07-0112-1/+506
|\ \
| * | cgroup: bpf: Add an example to do cgroup checking in BPFMartin KaFai Lau2016-07-015-0/+367
| * | cgroup: bpf: Add bpf_skb_in_cgroup_protoMartin KaFai Lau2016-07-013-1/+56
| * | cgroup: bpf: Add BPF_MAP_TYPE_CGROUP_ARRAYMartin KaFai Lau2016-07-014-1/+48
| * | cgroup: Add cgroup_get_from_fdMartin KaFai Lau2016-07-012-0/+36
|/ /
* | Merge branch 'bpf-robustify'David S. Miller2016-07-019-61/+34
|\ \
| * | bpf: refactor bpf_prog_get and type check into helperDaniel Borkmann2016-07-017-44/+31
| * | bpf: generally move prog destruction to RCU deferralDaniel Borkmann2016-07-014-19/+5
|/ /
* | atm: horizon: Use setup_timerAmitoj Kaur Chawla2016-07-011-3/+1
* | Merge branch 'qed-next'David S. Miller2016-07-013-58/+133
|\ \
| * | qede: Bump up driver version to 8.10.1.20Manish Chopra2016-07-011-1/+1
| * | qede: Add get/set rx copy break tunable supportManish Chopra2016-07-013-1/+51