From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 29 Jan 2020 13:44:53 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/network/iproute2/iproute2-next
X-Git-Tag: v5.6.0~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d80d22d5fd63f82d056efafe1e42e6f5aef5223a;p=thirdparty%2Fiproute2.git

Merge branch 'master' of git://git.kernel.org/pub/scm/network/iproute2/iproute2-next

Resolved conflict in tc/f_flower.c
---

d80d22d5fd63f82d056efafe1e42e6f5aef5223a