Merge branch 'master' into amd-master-next

Change-Id: Ib7e7824073f4dfc391fb3833fc90e11b327d3c22


[ROCm/hip commit: 258adce78e]

projects/hip/packaging/hip-nvcc.postinst

@@ -3,6 +3,6 @@
 ROCMDIR=@ROCM_PATH@
 HIPDIR=$ROCMDIR/hip
 
-if [ -d $ROCMDIR]
+if [ -d $ROCMDIR] ; then
     ln -s -f $ROCMDIR /opt/rocm
 fi

projects/hip/packaging/hip-nvcc.prerm

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-if [ -L "/opt/rocm" ]
+if [ -L "/opt/rocm" ] ; then
    unlink /opt/rocm
 fi