Merge amd-staging into amd-master 20240622

Signed-off-by: jingyu1l <Jingyu1.Li@amd.com>
Change-Id: I7d1c62c8e61c5e43200efd4b5abd7f48e8182e65


[ROCm/rocm_smi_lib commit: 5463955787]

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

@@ -1938,7 +1938,7 @@ def showAllConcise(deviceList):
     """
     global PRINT_JSON, appWidth
     if PRINT_JSON:
-        print('ERROR: Cannot print JSON/CSV output for concise output')
+        print('NOT_SUPPORTED: Cannot print JSON/CSV output for concise output')
         sys.exit(1)
 
     silent = True
@@ -2042,7 +2042,7 @@ def showAllConciseHw(deviceList):
     """
     global PRINT_JSON
     if PRINT_JSON:
-        print('ERROR: Cannot print JSON/CSV output for concise hardware output')
+        print('NOT_SUPPORTED: Cannot print JSON/CSV output for concise hardware output')
         sys.exit(1)
     header = ['GPU', 'NODE', 'DID', 'GUID', 'GFX VER', 'GFX RAS', 'SDMA RAS', 'UMC RAS', 'VBIOS', 'BUS'
                , 'PARTITION ID']