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>

diff --cc devlink/devlink.c
index fd3f79017f714bb366da15d089aadca8e2862169,0293373928f50c9328e1e376122361e1ec444a67..5e762e37540cace4080b97cdcaa5348de35e2e3f
--- 1/devlink/devlink.c
--- 2/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;

diff --cc ip/ipnexthop.c
Simple merge

diff --cc rdma/res.c
Simple merge