Merge amd-staging into amd-master 20220708

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: I8c0061b099bb140ecc6c3c4b491165da44c6b96a


[ROCm/rocm_smi_lib commit: 46e21f2509]

projects/rocm-smi-lib/python_smi_tools/rocm_smi.py

@@ -455,7 +455,7 @@ def printErrLog(device, err):
     global PRINT_JSON
     devName = device
     for line in err.split('\n'):
-        errstr = 'GPU[%s] \t\t: %s' % (devName, line)
+        errstr = 'GPU[%s]\t: %s' % (devName, line)
         if not PRINT_JSON:
             logging.error(errstr)
         else: