]> granicus.if.org Git - libnl/commitdiff
route/xfrmi: merge branch 'ebirger/add-xfrmi-support'
authorThomas Haller <thaller@redhat.com>
Sun, 1 Sep 2019 12:39:55 +0000 (14:39 +0200)
committerThomas Haller <thaller@redhat.com>
Sun, 1 Sep 2019 12:40:08 +0000 (14:40 +0200)
Rebased original pull request #214 on master. One commit ("xfrmi: add
IFLA_XFRM_* definitions to if_link.h") was thereby dropped as it
is no longer necessary. Otherwise, the two remaining patches applied
cleanly. Then, add two more patches to the branch before merging.

https://github.com/thom311/libnl/pull/214


Trivial merge