From: Keith Busch <kbusch@kernel.org>
Date: Fri, 6 Aug 2021 20:07:26 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/michael-gebis/nvme-cli into michael-gebis... 
X-Git-Tag: v1.15~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9709fb8314c43cabe459a490d25faa6d3502cc77;p=users%2Fsagi%2Fnvme-cli.git

Merge branch 'master' of https://github.com/michael-gebis/nvme-cli into michael-gebis-master
---

9709fb8314c43cabe459a490d25faa6d3502cc77
diff --cc completions/bash-nvme-completion.sh
index 563c8487,0921cd74..d3cca441
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@@ -44,15 -143,17 +143,20 @@@ nvme_list_opts () 
  			--human-readable -H --vendor-specific -v \
  			--force -f --output-format= -o"
  			;;
+ 		"id-ns-granularity")
+ 		opts+=" --output-format= -o"
+ 			;;
  		"list-ns")
- 		opts+=" --namespace-id= -n --al -a --csi= -y"
+ 		opts+=" --namespace-id= -n --al -a --csi= -y \
+ 			--outputformat= -o"
  			;;
- 		"id-iocs")
- 		opts+=" --controller-id= -c"
+ 		"list-ctrl")
+ 		opts+=" --namespace-id= -n --cntid= -c \
+ 			--output-format= -o"
  			;;
 +		"id-domain")
 +		opts+=" --dom-id= -d --output-format= -o"
 +			;;
  		"nvm-id-ctrl")
  		opts+=" --output-format= -o"
  			;;