From: David Ahern <dsahern@gmail.com>
Date: Thu, 19 Sep 2019 14:55:53 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v5.4.0~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a32692ac9c275f208c83eaf38d7f4267ebbef9e3;p=thirdparty%2Fiproute2.git

Merge branch 'master' into next

Conflicts:
	devlink/devlink.c

Fixed the conflict by updating the numbering for all new attributes
after the ones in master branch.

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

a32692ac9c275f208c83eaf38d7f4267ebbef9e3
diff --cc devlink/devlink.c
index fd3f79017,029337392..5e762e375
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@@ -255,14 -231,11 +255,14 @@@ static void ifname_map_free(struct ifna
  #define DL_OPT_FLASH_FILE_NAME	BIT(25)
  #define DL_OPT_FLASH_COMPONENT	BIT(26)
  #define DL_OPT_HEALTH_REPORTER_NAME	BIT(27)
- #define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD	BIT(27)
- #define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER	BIT(28)
- #define DL_OPT_TRAP_NAME		BIT(29)
- #define DL_OPT_TRAP_ACTION		BIT(30)
- #define DL_OPT_TRAP_GROUP_NAME		BIT(31)
+ #define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD	BIT(28)
+ #define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER	BIT(29)
++#define DL_OPT_TRAP_NAME		BIT(30)
++#define DL_OPT_TRAP_ACTION		BIT(31)
++#define DL_OPT_TRAP_GROUP_NAME		BIT(32)
  
  struct dl_opts {
 -	uint32_t present; /* flags of present items */
 +	uint64_t present; /* flags of present items */
  	char *bus_name;
  	char *dev_name;
  	uint32_t port_index;