From: David Ahern <dsahern@kernel.org>
Date: Fri, 16 Dec 2022 16:12:38 +0000 (-0700)
Subject: Merge branch 'main' into next
X-Git-Tag: v6.2.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3715a146e813745ed14cc1cf8cdd527495832c9e;p=thirdparty%2Fiproute2.git

Merge branch 'main' into next

Conflicts:
	devlink/devlink.c

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

3715a146e813745ed14cc1cf8cdd527495832c9e
diff --cc devlink/devlink.c
index cb9b154b4,11daf0c36..b865b83c8
--- a/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_PRIORITY |
- 			    DL_OPT_PORT_FN_RATE_TX_WEIGHT);
++			    DL_OPT_PORT_FN_RATE_TX_WEIGHT |
+ 			    DL_OPT_PORT_FN_RATE_PARENT);
  	if (err)
  		return err;