summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tools: bpftool: provide JSON output for all possible commandsQuentin Monnet2017-10-243-6/+47
* tools: bpftool: turn err() and info() macros into functionsQuentin Monnet2017-10-245-91/+126
* tools: bpftool: add JSON output for `bpftool batch file FILE` commandQuentin Monnet2017-10-241-0/+20
* tools: bpftool: add JSON output for `bpftool map *` commandsQuentin Monnet2017-10-241-20/+129
* tools: bpftool: add JSON output for `bpftool prog dump xlated *` commandQuentin Monnet2017-10-245-2/+89
* tools: bpftool: add JSON output for `bpftool prog dump jited *` commandQuentin Monnet2017-10-241-6/+80
* tools: bpftool: add JSON output for `bpftool prog show *` commandQuentin Monnet2017-10-241-32/+107
* tools: bpftool: introduce --json and --pretty optionsQuentin Monnet2017-10-242-3/+35
* tools: bpftool: add option parsing to bpftool, --help and --versionQuentin Monnet2017-10-244-1/+50
* tools: bpftool: copy JSON writer from iproute2 repositoryQuentin Monnet2017-10-242-0/+418
* Merge branch 'tcp-tracepoints'David S. Miller2017-10-247-7/+206
|\
| * tcp: add tracepoint trace_tcp_set_state()Song Liu2017-10-242-0/+80
| * tcp: add tracepoint trace_tcp_destroy_sockSong Liu2017-10-242-0/+9
| * tcp: add tracepoint trace_tcp_receive_resetSong Liu2017-10-242-0/+69
| * tcp: add tracepoint trace_tcp_send_resetSong Liu2017-10-245-3/+31
| * tcp: mark trace event arguments sk and skb as constSong Liu2017-10-241-4/+4
| * tcp: add trace event class tcp_event_sk_skbSong Liu2017-10-241-1/+14
|/
* Merge branch 'hns3-next'David S. Miller2017-10-244-12/+11
|\
| * net: hns3: fix a bug about hns3_clean_tx_ringLipeng2017-10-242-4/+4
| * net: hns3: remove redundant memset when alloc bufferLipeng2017-10-241-2/+0
| * net: hns3: fix the TX/RX ring.queue_index in hns3_ring_get_cfgLipeng2017-10-241-2/+2
| * net: hns3: get vf count by pci_sriov_get_totalvfsLipeng2017-10-241-1/+2
| * net: hns3: fix the ops check in hns3_get_rxnfcLipeng2017-10-241-1/+1
| * net: hns3: fix the bug when map buffer failLipeng2017-10-241-1/+1
| * net: hns3: fix a bug when alloc new bufferLipeng2017-10-241-1/+1
|/
* Merge tag 'batadv-next-for-davem-20171023' of git://git.open-mesh.org/linux-m...David S. Miller2017-10-243-84/+295
|\
| * batman-adv: use inline kernel-doc for uapi constantsSven Eckelmann2017-10-231-79/+290
| * batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementationSven Eckelmann2017-10-171-5/+4
| * batman-adv: Add missing kerneldoc for extackSven Eckelmann2017-10-121-0/+1
* | net: core: rtnetlink: use BUG_ON instead of if condition followed by BUGGustavo A. R. Silva2017-10-231-2/+1
* | net: systemport: Guard against unmapped TX ringFlorian Fainelli2017-10-231-0/+3
* | Merge branch 'mlxsw-Add-support-for-non-equal-cost-multi-path'David S. Miller2017-10-236-61/+484
|\ \
| * | mlxsw: spectrum: Add another partition to KVD linearIdo Schimmel2017-10-231-2/+17
| * | mlxsw: spectrum: Increase number of linear entriesIdo Schimmel2017-10-232-3/+3
| * | mlxsw: spectrum_router: Populate adjacency entries according to weightsIdo Schimmel2017-10-231-12/+99
| * | mlxsw: spectrum_router: Prepare for large adjacency groupsIdo Schimmel2017-10-231-0/+58
| * | mlxsw: spectrum_router: Store weight in nexthop structIdo Schimmel2017-10-231-0/+7
| * | mlxsw: spectrum: Add ability to query KVDL allocation sizeIdo Schimmel2017-10-232-0/+18
| * | mlxsw: spectrum: Better represent KVDL partitionsIdo Schimmel2017-10-233-37/+238
| * | mlxsw: spectrum_dpipe: Add adjacency group sizeIdo Schimmel2017-10-233-7/+44
|/ /
* | Merge branch 'bcm_sf2-Add-support-for-IPv6-CFP-rules'David S. Miller2017-10-234-245/+902
|\ \
| * | net: dsa: bcm_sf2: Allow matching arbitrary IPv6 masks/lengthsFlorian Fainelli2017-10-231-33/+80
| * | net: dsa: bcm_sf2: Allow matching arbitrary IPv4 mask lengthsFlorian Fainelli2017-10-232-88/+149
| * | net: dsa: bcm_sf2: Add support for IPv6 CFP rulesFlorian Fainelli2017-10-234-40/+534
| * | net: dsa: bcm_sf2: Simplify bcm_sf2_cfp_rule_get_all()Florian Fainelli2017-10-231-54/+14
| * | net: dsa: bcm_sf2: Make UDF slices more configurableFlorian Fainelli2017-10-232-32/+76
| * | net: dsa: bcm_sf2: Move IPv4 CFP processing to specific functionsFlorian Fainelli2017-10-231-116/+163
| * | net: dsa: bcm_sf2: Use existing shift/masksFlorian Fainelli2017-10-232-4/+8
|/ /
* | isdn/gigaset: Provide cardstate context for bas timer callbacksKees Cook2017-10-231-8/+6
* | selftests/bpf: fix broken build of test_mapsAlexei Starovoitov2017-10-232-11/+57