Merge branch 'main' into next

Conflicts:
	devlink/devlink.c

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --cc devlink/devlink.c
index cb9b154b47b2c817ea0b824f9b861b908f9524ac,11daf0c36e5d847e1769674e098eb02ff9495e56..b865b83c826333d24ebfeb777a30db5fa1096524
--- 1/devlink/devlink.c
--- 2/devlink/devlink.c
+++ b/devlink/devlink.c
@@@ -5258,8 -5050,7 +5258,9 @@@ static int cmd_port_fn_rate_add(struct 
  
        err = dl_argv_parse(dl, DL_OPT_PORT_FN_RATE_NODE_NAME,
                            DL_OPT_PORT_FN_RATE_TX_SHARE | DL_OPT_PORT_FN_RATE_TX_MAX |
-                           DL_OPT_PORT_FN_RATE_TX_WEIGHT);
 +                          DL_OPT_PORT_FN_RATE_TX_PRIORITY |
++                          DL_OPT_PORT_FN_RATE_TX_WEIGHT |
+                           DL_OPT_PORT_FN_RATE_PARENT);
        if (err)
                return err;
  

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