aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "ss: remove wtf." am: 4bf8496 am: d9cdcb0 am: 1404f4candroid-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7android-n-iot-release-ihome-igv1android-n-iot-preview-4android-n-iot-preview-2android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-iot-releasenougat-devnougat-cts-releasen-iot-preview-4n-iot-preview-2Josh Gao2016-05-121-1/+1
* Merge "Fix GCC builds of \'ss\' by insisting on clang."android-wear-n-preview-1android-n-preview-2android-n-preview-1n-preview-2n-preview-1Elliott Hughes2016-02-061-2/+2
|\
| * Merge "Fix GCC builds of 'ss' by insisting on clang."brillo-m10-releasebrillo-m10-devElliott Hughes2016-02-061-2/+2
| |\
| | * Fix GCC builds of 'ss' by insisting on clang.Elliott Hughes2016-02-051-2/+2
| |/
* | Merge "Add the ability to compile ss."Elliott Hughes2016-02-060-0/+0
|\|
| * Merge "Add the ability to compile ss."Elliott Hughes2016-02-062-1/+41
| |\
| | * Add the ability to compile ss.Lorenzo Colitti2016-02-052-1/+41
| |/
* | Merge "Merge remote-tracking branch \'aosp/upstream-master\' into mymerge"Elliott Hughes2016-02-06276-3066/+19895
|\|
| * Merge "Merge remote-tracking branch 'aosp/upstream-master' into mymerge"Elliott Hughes2016-02-06276-3066/+19895
| |\
| | * Merge remote-tracking branch 'aosp/upstream-master' into mymergeElliott Hughes2016-02-05276-3066/+19895
| |/|
| | * ss: support closing inet sockets via SOCK_DESTROY.Lorenzo Colitti2016-01-182-2/+53
| | * libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talkLorenzo Colitti2016-01-181-2/+4
| | * ip-link: fix man page warningsThomas Faivre2016-01-181-51/+51
| | * vxlan: fix help and man textThomas Faivre2016-01-182-2/+3
| | * tc, bpf: more header checks on loading elfDaniel Borkmann2016-01-181-0/+43
| | * tc, bpf: check section names and type everywhereDaniel Borkmann2016-01-181-6/+15
| | * tc, clsact: add clsact frontendDaniel Borkmann2016-01-184-14/+88
| | * tc, ingress: clean up ingress handling a bitDaniel Borkmann2016-01-182-23/+8
| | * update headers (post 4.4 merge window)Stephen Hemminger2016-01-182-1/+29
| | * Merge branch 'net-next'Stephen Hemminger2016-01-1856-1135/+3038
| | |\
| | | * tipc: add peer remove functionalityRichard Alpe2016-01-1112-1/+177
| | | * man: iplink: document new addrgenmodesBjørn Mork2016-01-061-3/+15
| | | * iplink: support show and set of "addrgenmode random"Bjørn Mork2016-01-062-1/+6
| | | * iplink: support setting addrgenmode stable_secretBjørn Mork2016-01-061-1/+3
| | | * update most kernel headersStephen Hemminger2016-01-063-0/+24
| | | * Update to current iptables headersStephen Hemminger2016-01-039-434/+794
| | | * add coverity model fileStephen Hemminger2015-12-301-0/+19
| | | * lnstat: fix error handlingStephen Hemminger2015-12-301-3/+10
| | | * monitor: fix file handle leakStephen Hemminger2015-12-303-5/+17
| | | * genl: make string constStephen Hemminger2015-12-301-1/+1
| | | * iproute2: ip-route.8.in: Add expires option for ip routeHangbin Liu2015-12-301-1/+9
| | | * iproute2: ip-route.8.in: Add missing '[' before 'pref'Hangbin Liu2015-12-301-1/+1
| | | * route: allow routes to be configured with expire valuesHangbin Liu2015-12-211-1/+10
| | | * Merge branch 'master' into net-nextStephen Hemminger2015-12-218-42/+160
| | | |\
| | | * | bpf: minor fix in api and bpf_dump_error() usageDaniel Borkmann2015-12-172-2/+2
| | | * | include: update kernel headersStephen Hemminger2015-12-174-0/+6
| | | * | Merge branch 'master' into net-nextStephen Hemminger2015-12-176-8/+139
| | | |\ \
| | | * | | examples, bpf: further improve examplesDaniel Borkmann2015-12-108-202/+327
| | | * | | Merge branch 'master' into net-nextStephen Hemminger2015-12-107-42/+89
| | | |\ \ \
| | | * | | | {f,m}_bpf: add more example codeDaniel Borkmann2015-11-295-0/+241
| | | * | | | {f,m}_bpf: allow updates on program arraysDaniel Borkmann2015-11-293-149/+306
| | | * | | | {f, m}_bpf: allow for user-defined object pinningsDaniel Borkmann2015-11-295-25/+204
| | | * | | | {f, m}_bpf: check map attributes when fetching as pinnedDaniel Borkmann2015-11-291-0/+53
| | | * | | | {f,m}_bpf: make tail calls workingDaniel Borkmann2015-11-291-8/+19
| | | * | | | Merge branch 'master' into net-nextStephen Hemminger2015-11-2914-196/+223
| | | |\ \ \ \
| | | * | | | | geneve: add support for IPv6 link partnersJohn W. Linville2015-11-231-7/+13
| | | * | | | | {f,m}_bpf: allow for sharing mapsDaniel Borkmann2015-11-2310-608/+1105
| | * | | | | | Revert "tc: fix compilation with old gcc (< 4.6)"Stephen Hemminger2016-01-181-27/+21
| | * | | | | | v4.4.0Stephen Hemminger2016-01-111-1/+1
| | * | | | | | Revert "tipc: add peer remove functionality"Stephen Hemminger2016-01-1112-177/+1