Merging upstream version 1.15.

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

completions/_nvme

@@ -11,6 +11,7 @@ _nvme () {
 	'id-ns:display information about the namespace'
 	'list-ns:identify all namespace(s) attached'
 	'id-iocs:display information about I/O command sets'
+	'id-domain:display information about domain list'
 	'create-ns:create a new namespace before attachment'
 	'delete-ns:delete a detached namespace'
 	'attach-ns:attach namespace to controller'
@@ -47,6 +48,7 @@ _nvme () {
 	'compare:compare data on device to data elsewhere'
 	'read:submit a read command'
 	'write:submit a write command'
+	'capacity-mgmt: submit capacity management command'
 	'show-regs:shows the controller registers; requires admin character device'
 	'help:print brief descriptions of all nvme commands'
 	)
@@ -113,6 +115,16 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme id-iocs options" _idiocs
 			;;
+		(id-domain)
+			local _iddomain
+			_iddomain=(
+			/dev/nvme':supply a device to use (required)'
+			--dom-id=':show infos for domain id <cntid>'
+			-d':alias of --dom-id'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme id-domain options" _iddomain
+			;;
 		nvm-id-ctrl)
 			local _nvmidctrl
 			_nvmidctrl=(
@@ -232,14 +244,14 @@ _nvme () {
 			--log-entries=': Number of pending NVM Set Entries log list'
 			-e':alias to --log-entries'
 			--rae': Retain an Asynchronous Event'
-			-r':alias to --rae
+			-r':alias to --rae'
 			--raw-binary':dump infos in binary format'
 			-b':alias of --raw-binary'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme pred-lat-event-agg-log options" _predlateventagglog
 			;;
-		(predictablelatlog)
+		(predictable-lat-log)
 			local _predictablelatlog
 			_predictablelatlog=(
 			/dev/nvme':supply a device to use (required)'
@@ -306,7 +318,7 @@ _nvme () {
 			--log-entries=': Number of Endurance Group Event Agg Entries log list'
 			-e':alias to --log-entries'
 			--rae': Retain an Asynchronous Event'
-			-r':alias to --rae
+			-r':alias to --rae'
 			--raw-binary':dump infos in binary format'
 			-b':alias of --raw-binary'
 			)
@@ -318,7 +330,7 @@ _nvme () {
 			_lbastatuslog=(
 			/dev/nvme':supply a device to use (required)'
 			--rae': Retain an Asynchronous Event'
-			-r':alias to --rae
+			-r':alias to --rae'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme lba-status-log options" _lbastatuslog
@@ -343,6 +355,8 @@ _nvme () {
 			-s':alias to --sel'
 			--data-len=':buffer len for returned LBA Type Range or host identifier data'
 			-l':alias for --data-len'
+			--uuid-index=':uuid index'
+			-U':alias for --uuid-index'
 			--cdw11=':dword 11 value, used for interrupt vector configuration only'
 			--raw-binary':dump infos in binary format'
 			-b':alias to --raw-binary'
@@ -364,6 +378,8 @@ _nvme () {
 			-d':alias to --data'
 			--value=':new value of feature (required)'
 			-v'alias to --value'
+			--uuid-index=':uuid index'
+			-U':alias for --uuid-index'
 			)
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme set-feature options" _setf
@@ -414,6 +430,22 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme fw-download options" _fwd
 			;;
+		(capacity-mgmt)
+			local _fwd
+			_fwd=(
+			/dev/nvme':supply a device to use (required)'
+			--operation=':Operation to be performed by the controller'
+			-o':alias of --operation'
+			--element-id=':specific to the value of the Operation field'
+			-i':alias of --element-id'
+			--cap-lower=':Least significant 32 bits of the capacity in bytes'
+			-l':alias of --cap-lower'
+			--cap-upper=':Most significant 32 bits of the capacity in bytes'
+			-u':alias of --cap-upper'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme capacity-mgmt options" _fwd
+			;;
 		(admin-passthru)
 			local _admin
 			_admin=(
@@ -558,7 +590,7 @@ _nvme () {
 			-p':alias for --prkey'
 			--rtype=':hexadecimal reservation type'
 			-t':alias for --rtype'
-			--racqa=':reservation acquiry action'
+			--racqa=':reservation acquire action'
 			-a':alias for --racqa'
 			--iekey=':ignore existing reservation key'
 			-i':alias for --iekey'
@@ -611,7 +643,7 @@ _nvme () {
 			--cptpl=':change persistence through power loss setting'
 			-p':alias for --cptpl'
 			--rrega=':reservation registration action to perform'
-			-a':alias for --rrega'
+			-r':alias for --rrega'
 			--iekey':ignore existing reservation key'
 			-i':alias for --iekey'
 			)
@@ -788,7 +820,7 @@ _nvme () {
 			     security-send security-recv resv-acquire resv-register resv-release
 			     resv-report flush compare read write copy show-regs persistent-event-log
 				 pred-lat-event-agg-log nvm-id-ctrl endurance-event-agg-log lba-status-log
-				 resv-notif-log
+				 resv-notif-log capacity-mgmt id-domain
 			   )
 			_arguments '*:: :->subcmds'
 			_describe -t commands "help: infos on a specific nvme command, or provide no option to see a synopsis of all nvme commands" _h