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

diff --cc completions/bash-nvme-completion.sh
index 563c848737c5a4f20879dfd86f4f1e43615f1fb0,0921cd74159a9e1588807425122cb7829359ecc1..d3cca4412d66bafe2e90ff49627a2a1b28f1cb3f
--- 1/completions/bash-nvme-completion.sh
--- 2/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"
                        ;;

diff --cc nvme-print.c
Simple merge