Merge 'master' into 'amd-master'

Change-Id: I70ca0d1cbf293b22b271e19cfd82abcee8c4295f


[ROCm/amdsmi commit: e2afebe585]

projects/amdsmi/include/rocm_smi/rocm_smi.h

@@ -50,7 +50,6 @@ extern "C" {
 #include <stdint.h>
 #endif  // __cplusplus
 
-#include <stdint.h>
 #include <stddef.h>
 
 /** \file rocm_smi.h
@@ -115,9 +114,10 @@ typedef enum {
 
 /**
  * @brief Initialization flags
- * 
+ *
  * Initialization flags may be OR'd together and passed to ::rsmi_init().
  */
+
 typedef enum {
   RSMI_INIT_FLAG_ALL_GPUS      = 0x1,    //!< Attempt to add all GPUs found
                                          //!< (including non-AMD) to the list

projects/amdsmi/src/rocm_smi_main.cc

@@ -348,7 +348,7 @@ static bool isAMDGPU(std::string dev_path) {
   fs.open(vend_path);
 
   if (!fs.is_open()) {
-      return errno;
+      return false;
   }
 
   uint32_t vendor_id;