netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH ethtool] Fix help message for master-slave option
@ 2021-01-20 12:21 Yuusuke Ashizuka
  2021-01-24 21:02 ` Michal Kubecek
  0 siblings, 1 reply; 2+ messages in thread
From: Yuusuke Ashizuka @ 2021-01-20 12:21 UTC (permalink / raw)
  To: mkubecek; +Cc: netdev, ashiduka

Fixes: 558f7cc33daf ("netlink: add master/slave configuration support")
Signed-off-by: Yuusuke Ashizuka <ashiduka@fujitsu.com>
---
 ethtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ethtool.c b/ethtool.c
index 585aafa..84a61f4 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -5630,7 +5630,7 @@ static const struct option args[] = {
 			  "		[ wol %d[/%d] | p|u|m|b|a|g|s|f|d... ]\n"
 			  "		[ sopass %x:%x:%x:%x:%x:%x ]\n"
 			  "		[ msglvl %d[/%d] | type on|off ... [--] ]\n"
-			  "		[ master-slave master-preferred|slave-preferred|master-force|slave-force ]\n"
+			  "		[ master-slave preferred-master|preferred-slave|forced-master|forced-slave ]\n"
 	},
 	{
 		.opts	= "-a|--show-pause",
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH ethtool] Fix help message for master-slave option
  2021-01-20 12:21 [PATCH ethtool] Fix help message for master-slave option Yuusuke Ashizuka
@ 2021-01-24 21:02 ` Michal Kubecek
  0 siblings, 0 replies; 2+ messages in thread
From: Michal Kubecek @ 2021-01-24 21:02 UTC (permalink / raw)
  To: Yuusuke Ashizuka; +Cc: netdev

[-- Attachment #1: Type: text/plain, Size: 895 bytes --]

On Wed, Jan 20, 2021 at 09:21:22PM +0900, Yuusuke Ashizuka wrote:
> Fixes: 558f7cc33daf ("netlink: add master/slave configuration support")
> Signed-off-by: Yuusuke Ashizuka <ashiduka@fujitsu.com>

Applied, thank you.

Michal

> ---
>  ethtool.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ethtool.c b/ethtool.c
> index 585aafa..84a61f4 100644
> --- a/ethtool.c
> +++ b/ethtool.c
> @@ -5630,7 +5630,7 @@ static const struct option args[] = {
>  			  "		[ wol %d[/%d] | p|u|m|b|a|g|s|f|d... ]\n"
>  			  "		[ sopass %x:%x:%x:%x:%x:%x ]\n"
>  			  "		[ msglvl %d[/%d] | type on|off ... [--] ]\n"
> -			  "		[ master-slave master-preferred|slave-preferred|master-force|slave-force ]\n"
> +			  "		[ master-slave preferred-master|preferred-slave|forced-master|forced-slave ]\n"
>  	},
>  	{
>  		.opts	= "-a|--show-pause",
> -- 
> 2.29.2
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-01-24 21:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-20 12:21 [PATCH ethtool] Fix help message for master-slave option Yuusuke Ashizuka
2021-01-24 21:02 ` Michal Kubecek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).