Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 374ead1d19.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9

docs/markdown/hip_faq.md

@@ -247,4 +247,4 @@ The workaround is to explicitly add the keyword of "static" before any functions
 Product of block.x, block.y, and block.z should be less than 1024.
 
 ### Are __shfl_*_sync functions supported on HIP platform?
-__shfl_*_sync is not supported on HIP but for nvcc path CUDA 9.0 and above all shuffle calls get redirected to it's sync version.
+__shfl_*_sync is not supported on HIP but for nvcc path CUDA 9.0 and above all shuffle calls get redirected to it's sync version.