Merge remote-tracking branch 'rocmsmi/amd-staging' into HEAD

Change-Id: I0661926c10eef2bc32b83d9a63a3a6eb6991e781

rocm_smi/python_smi_tools/README.md

@@ -74,7 +74,7 @@ Display Options:
   -a, --showallinfo                                     Show Temperature, Fan and Clock values
 
 Topology:
-  -i, --showid                                          Show GPU ID
+  -i, --showid                                          Show DEVICE ID
   -v, --showvbios                                       Show VBIOS version
   --showdriverversion                                   Show kernel driver version
   --showfwinfo [BLOCK [BLOCK ...]]                      Show FW information