Merge "Merge remote-tracking branch \'aosp/upstream-master\' into mymerge"
am: 85dbc764c7
* commit '85dbc764c721a033af848596b1ca0fb25a5fcc9b': (361 commits)
ss: support closing inet sockets via SOCK_DESTROY.
libnetlink: don't print NETLINK_SOCK_DIAG errors in rtnl_talk
ip-link: fix man page warnings
vxlan: fix help and man text
tc, bpf: more header checks on loading elf
tc, bpf: check section names and type everywhere
tc, clsact: add clsact frontend
tc, ingress: clean up ingress handling a bit
update headers (post 4.4 merge window)
Revert "tc: fix compilation with old gcc (< 4.6)"
tipc: add peer remove functionality
v4.4.0
Revert "tipc: add peer remove functionality"
tc: flower no need to specify the ethertype
tc: fix compilation with old gcc (< 4.6)
iplink: replace exit with return
tc: m_connmark: Fix help text
man: fix whatis for fq
tipc: add peer remove functionality
tipc: fix help text spelling error in node.c
...
