From: David Ahern <dsahern@gmail.com>
Date: Wed, 20 Nov 2019 02:31:01 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: v5.5.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=536dcd2016eab4968fa689f166cf72c4ba0add91;p=thirdparty%2Fiproute2.git

Merge branch 'master' into next

Conflicts:
	include/uapi/linux/devlink.h

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

536dcd2016eab4968fa689f166cf72c4ba0add91
diff --cc include/uapi/linux/devlink.h
index ab09b3b83,84c0caf22..d904cdd7e
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@@ -421,10 -421,7 +421,12 @@@ enum devlink_attr 
  
  	DEVLINK_ATTR_RELOAD_FAILED,			/* u8 0 or 1 */
  
+ 	DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,	/* u64 */
++
 +	DEVLINK_ATTR_NETNS_FD,			/* u32 */
 +	DEVLINK_ATTR_NETNS_PID,			/* u32 */
 +	DEVLINK_ATTR_NETNS_ID,			/* u32 */
 +
  	/* add new attributes above here, update the policy in devlink.c */
  
  	__DEVLINK_ATTR_MAX,