From: David Ahern <dsahern@gmail.com>
Date: Wed, 25 Jul 2018 17:08:04 +0000 (-0700)
Subject: Merge branch 'iproute2-master' into iproute2-next
X-Git-Tag: v4.19.0~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bc57e1ef582a6d586e78cb9c1ecd0b83fb472c;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into iproute2-next

Conflicts:
	include/uapi/linux/bpf.h

Signed-off-by: David Ahern <dsahern@gmail.com>
---

a0bc57e1ef582a6d586e78cb9c1ecd0b83fb472c