aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/upstream-master' into mymergeElliott Hughes2016-02-0555-615/+2967
|\
| * update headers (post 4.4 merge window)Stephen Hemminger2016-01-182-1/+29
| * Merge branch 'net-next'Stephen Hemminger2016-01-1819-434/+1063
| |\
| | * tipc: add peer remove functionalityRichard Alpe2016-01-111-0/+1
| | * update most kernel headersStephen Hemminger2016-01-063-0/+24
| | * Update to current iptables headersStephen Hemminger2016-01-039-434/+794
| | * bpf: minor fix in api and bpf_dump_error() usageDaniel Borkmann2015-12-171-1/+1
| | * include: update kernel headersStephen Hemminger2015-12-174-0/+6
| | * Merge branch 'master' into net-nextStephen Hemminger2015-12-172-0/+19
| | |\
| | * | examples, bpf: further improve examplesDaniel Borkmann2015-12-101-0/+225
| | * | {f, m}_bpf: allow for user-defined object pinningsDaniel Borkmann2015-11-292-1/+5
| | * | Merge branch 'master' into net-nextStephen Hemminger2015-11-291-1/+6
| | |\ \
| | * | | {f,m}_bpf: allow for sharing mapsDaniel Borkmann2015-11-232-0/+9
| * | | | v4.4.0Stephen Hemminger2016-01-111-1/+1
| * | | | Revert "tipc: add peer remove functionality"Stephen Hemminger2016-01-111-1/+0
| * | | | tipc: add peer remove functionalityRichard Alpe2016-01-061-0/+1
| | |_|/ | |/| |
| * | | ila: Add support for ILA lwtunnelsTom Herbert2015-12-172-0/+19
| | |/ | |/|
| * | libnetlink: introduce nc_flagsPhil Sutter2015-11-291-1/+6
| |/
| * update kernel headers to 4.4-rc1Stephen Hemminger2015-11-232-37/+9
| * Merge branch 'master' into net-nextStephen Hemminger2015-11-031-1/+1
| |\
| | * v4.3.0Stephen Hemminger2015-11-031-1/+1
| * | add new IFLA_VF_TRUST netlink attributeStephen Hemminger2015-10-231-0/+6
| * | update bpf kernel headerStephen Hemminger2015-10-221-0/+11
| * | Merge branch 'master' into net-nextStephen Hemminger2015-10-222-3/+2
| |\|
| | * ip, realms: also allow to pass in raw realms valueDaniel Borkmann2015-10-221-2/+1
| | * update kernel headersStephen Hemminger2015-10-221-1/+1
| * | lwtunnel: Add encapsulation support to ip routeRoopa Prabhu2015-10-161-0/+3
| * | add tunnel header files from net-next uapiStephen Hemminger2015-10-162-0/+71
| * | Merge branch 'master' into net-nextStephen Hemminger2015-10-161-0/+10
| |\|
| | * libnetlink: introduce rta_nest and u8, u16, u64 helpers for nesting within rt...Roopa Prabhu2015-10-161-0/+10
| | * update kernel headersStephen Hemminger2015-10-122-1/+3
| * | f_bpf: allow for optional classid and add flagsDaniel Borkmann2015-10-121-0/+1
| * | ip neigh: Add support for filtering dumps by master deviceDavid Ahern2015-10-121-0/+2
| * | update kernel headers for net-nextStephen Hemminger2015-10-124-0/+58
| * | update kernel headers to 4.3 net-nextStephen Hemminger2015-09-235-1/+18
| |/
| * comment: Fix remaining listings of wrong FSF addressPhil Sutter2015-09-231-2/+1
| * update kernel headers to 4.2-net-nextStephen Hemminger2015-08-313-4/+11
| * Merge branch 'master' into net-nextStephen Hemminger2015-08-312-1/+2
| |\
| | * v4.2.0Stephen Hemminger2015-08-311-1/+1
| | * add support for brief output for link and addressesAndy Gospodarek2015-08-311-0/+1
| * | update kernel headers to 4.2-net-nextStephen Hemminger2015-08-232-15/+9
| * | Merge branch 'master' into net-nextStephen Hemminger2015-08-231-0/+61
| |\|
| | * provide common json output formatterStephen Hemminger2015-08-231-0/+61
| * | Merge branch 'master' into net-nextStephen Hemminger2015-08-135-84/+87
| |\|
| | * utils: add missing return valueZhang Shengju2015-08-131-1/+1
| | * remove unnecessary externStephen Hemminger2015-08-135-84/+87
| * | update header files from 4.2 net-nextStephen Hemminger2015-08-123-0/+3
| * | update to net-next (4.3) headersStephen Hemminger2015-08-103-1/+5
| * | update kernel headers from net-nextStephen Hemminger2015-07-312-0/+19
| * | update to 4.2-net-next headersStephen Hemminger2015-07-285-1/+30
| |/