Merging upstream version 1.16.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 13 deletions

diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index d3cca44..41938d7 100644
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -100,7 +100,9 @@ _cmds="list list-subsys id-ctrl id-ns \
 	ns-rescan show-regs discover connect-all \
 	connect disconnect disconnect-all gen-hostnqn \
 	show-hostnqn dir-receive dir-send virt-mgmt \
-	rpmb"
+	rpmb boot-part-log fid-support-effects-log \
+	supported-log-pages lockdown"
+	supported-log-pages list-endgrp"
 
 # Add plugins:
 for plugin in "${!_plugin_subcmds[@]}"; do
@@ -154,6 +156,10 @@ nvme_list_opts () {
 		opts+=" --namespace-id= -n --cntid= -c \
 			--output-format= -o"
 			;;
+		"cmdset-ind-id-ns")
+		opts+=" --namespace-id= -n --raw-binary -b \
+			--human-readable -H --output-format= -o"
+			;;
 		"id-domain")
 		opts+=" --dom-id= -d --output-format= -o"
 			;;
@@ -176,6 +182,9 @@ nvme_list_opts () {
 		"id-uuid")
 		opts+=" --output-format= -o --raw-binary -b --human-readable -H"
 			;;
+		"list-endgrp")
+		opts+=" --endgrp-id= -i --output-format= -o"
+			;;
 		"id-iocs")
 		opts+=" --controller-id= -c --output-format= -o --human-readable -H"
 			;;
@@ -202,6 +211,9 @@ nvme_list_opts () {
 			--rae -r --uuid-index= -U --csi= -y --ot -O \
 			--raw-binary -b"
 			;;
+		"supported-log-pages")
+		opts+=" --output-format= -o --human-readable -H"
+			;;
 		"telemetry-log")
 		opts+=" --output-file= -o --host-generate= -g \
 			--controller-init -c --data-area= -d"
@@ -219,6 +231,9 @@ nvme_list_opts () {
 		"ana-log")
 		opts+=" --output-format -o"
 			;;
+		"fid-support-effects-log")
+		opts+=" --output-format -o"
+			;;
 		"error-log")
 		opts+=" --raw-binary -b --log-entries= -e \
 			--output-format= -o"
@@ -252,6 +267,10 @@ nvme_list_opts () {
 		"resv-notif-log")
 		opts+=" --output-format= -o"
 			;;
+		"boot-part-log")
+		opts+=" --lsp -s --output-file= -f \
+			--output-format= -o"
+			;;
 		"get-feature")
 		opts+=" --namespace-id= -n --feature-id= -f --sel= -s \
 			--data-len= -l --cdw11= --c -uuid-index= -U --raw-binary -b \
@@ -289,6 +308,10 @@ nvme_list_opts () {
 		opts+=" --operation= -f --element-id= -i --cap-lower= -l \
 				--cap-upper= -u"
 			;;
+		"lockdown")
+		opts+=" --ofi= -O --ifc= -F --prhbt= -P \
+			-scp= -S --uuid -U"
+			;;
 		"admin-passthru")
 		opts+=" --opcode= -o --flags= -f --prefil= -p --rsvd= -R \
 			--namespace-id= -n --data-len= -l --metadata-len= -m \
@@ -572,7 +595,7 @@ plugin_amzn_opts () {
 		"id-ctrl")
 		opts+=" --raw-binary -b --human-readable -H \
 			--vendor-specific -v --output-format= -o"
-			;;	
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
@@ -624,7 +647,7 @@ plugin_lnvm_opts () {
 		opts+=" --target-name= -n"
 			;;
 		"factory")
-		opts+=" --device-name= -d --erase-only-marked -e 
+		opts+=" --device-name= -d --erase-only-marked -e
 			--clear-host-side-blks -s --clear-bb-blks -b"
 			;;
 		"diag-bbtbl")
@@ -836,7 +859,7 @@ plugin_huawei_opts () {
 		"id-ctrl")
 		opts+=" --raw-binary -b --human-readable -H \
 			--vendor-specific -v --output-format= -o"
-			;;	
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
@@ -878,7 +901,7 @@ plugin_toshiba_opts () {
 		opts+=$NO_OPTS
 			;;
 	esac
-	
+
 	COMPREPLY+=( $( compgen $compargs -W "$opts" -- $cur ) )
 
 	return 0
@@ -1081,12 +1104,12 @@ plugin_shannon_opts () {
 		"id-ctrl")
 		opts+=" --raw-binary -b --human-readable -H \
 			--vendor-specific -v --output-format= -o"
-			;;	
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
 	esac
-	
+
 	COMPREPLY+=( $( compgen $compargs -W "$opts" -- $cur ) )
 
 	return 0
@@ -1112,12 +1135,12 @@ plugin_dera_opts () {
 	case "$1" in
 		"smart-log-add")
 		opts+=$NO_OPTS
-			;;	
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
 	esac
-	
+
 	COMPREPLY+=( $( compgen $compargs -W "$opts" -- $cur ) )
 
 	return 0
@@ -1166,7 +1189,7 @@ plugin_sfx_opts () {
 		opts+=$NO_OPTS
 			;;
 	esac
-	
+
 	COMPREPLY+=( $( compgen $compargs -W "$opts" -- $cur ) )
 
 	return 0
@@ -1312,7 +1335,7 @@ plugin_nvidia_opts () {
 		"id-ctrl")
 		opts+=" --raw-binary -b --human-readable -H \
 			--vendor-specific -v --output-format= -o"
-			;;	
+			;;
 		"help")
 		opts+=$NO_OPTS
 			;;
@@ -1343,12 +1366,12 @@ plugin_ymtc_opts () {
 	case "$1" in
 		"smart-log-add")
 		opts+=" --namespace-id= -n --raw-binary -b"
-			;;	
+			;;
 		"help")
 		opts+=NO_OPTS
 			;;
 	esac
-	
+
 	COMPREPLY+=( $( compgen $compargs -W "$opts" -- $cur ) )
 
 	return 0