]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'master' into next
authorDavid Ahern <dsahern@gmail.com>
Wed, 20 Nov 2019 02:31:01 +0000 (02:31 +0000)
committerDavid Ahern <dsahern@gmail.com>
Wed, 20 Nov 2019 02:31:01 +0000 (02:31 +0000)
commit536dcd2016eab4968fa689f166cf72c4ba0add91
tree269d8687b8c35d6f9c6db61f237e4934d9c0168b
parentb0a688a542cdf503202c59e55c39c2067138a7bd
parenta7fa739d12777b3e10be1088848b9cc4099676ac
Merge branch 'master' into next

Conflicts:
include/uapi/linux/devlink.h

Signed-off-by: David Ahern <dsahern@gmail.com>
include/uapi/linux/devlink.h
man/man8/ip-link.8.in
misc/ss.c