Merge 'master' into 'amd-master'

Change-Id: I05d997b8f72cb3fdca93aacf787514a0aa288081


[ROCm/clr commit: 9fe3a9362f]

projects/clr/hipamd/src/hip_hcc.cpp

@@ -824,7 +824,7 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
 
     // Masquerade as a 3.0-level device. This will change as more HW functions are properly supported.
     // Application code should use the arch.has* to do detailed feature detection.
-    prop->major = 2;
+    prop->major = 3;
     prop->minor = 0;
 
     // Get number of Compute Unit