Merge amd-staging into amd-master 20221212

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


[ROCm/rocm_smi_lib commit: 34f4b63853]

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

@@ -2165,7 +2165,7 @@ def showRasInfo(deviceList, rasType):
                         row.append(ec.correctable_err)
                         row.append(ec.uncorrectable_err)
                 data.append(row)
-        printTableLog(['         Block', '     Status  ', 'uncorrectable err', 'correctable err'], data, device,
+        printTableLog(['         Block', '     Status  ', 'Correctable Error', 'Uncorrectable Error'], data, device,
                       'RAS INFO')
         # TODO: Use dynamic spacing for column widths
         printLogSpacer(None, '_')