Merging upstream version 2.4.

Signed-off-by: Daniel Baumann <daniel@debian.org>

completions/_nvme

@@ -231,9 +231,23 @@ _nvme () {
 			--dps=':data protection?'
 			-d':alias of --dps'
 			--nmic=':multipath and sharing'
-			-n':alias of --nmic'
+			-m':alias of --nmic'
+			--anagrp-id=':ANA Group Identifier'
+			-a':alias of --anagrp-id'
+			--nvmset-id=':NVM Set Identifier'
+			-i':alias of --nvmset-id'
+			--block-size=':target block size'
+			-b':alias of --block-size'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			--csi=':command set identifier'
 			-y':alias of --csi'
+			--lbstm=':logical block storage tag mask'
+			-l':alias of --lbstm'
+			--nsze-si=':size of ns (NSZE) in standard SI units'
+			-S':alias of --nsze-si'
+			--ncap-si=':capacity of ns (NCAP) in standard SI units'
+			-C':alias of --ncap-si'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme create-ns options" _createns
@@ -244,6 +258,8 @@ _nvme () {
 			/dev/nvme':supply a device to use (required)'
 			--namespace-id=':namespace to delete'
 			-n':alias of --namespace-id'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme delete-ns options" _deletens
@@ -505,6 +521,8 @@ _nvme () {
 			/dev/nvme':supply a device to use (required)'
 			--namespace-id=':<nsid> of namespace to format (required)'
 			-n':alias of --namespace-id'
+			--timeout=':value for timeout'
+			-t':alias of --timeout'
 			--lbaf=':LBA format to apply to namespace (required)'
 			-l':alias of --lbaf'
 			--ses=':secure erase? 0 - no-op (default), 1 - user-data erase, 2 - cryptographic erase'