Merge branch 'master' into next

Conflicts:
	include/uapi/linux/devlink.h

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

diff --cc include/uapi/linux/devlink.h
index ab09b3b83675eddafabbf28f1febbf29e35085b3,84c0caf229ff02879ec17785d43f89786858f6c6..d904cdd7e07a4eb08ae803c5d7270bc1b7f35e42
--- 1/include/uapi/linux/devlink.h
--- 2/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,

diff --cc man/man8/ip-link.8.in
Simple merge

diff --cc misc/ss.c
Simple merge