SWDEV-444835 - Merge changes in hip made in 6.1- to staging

Change-Id: I2ebebc7655f804a2192153ad1e07069ec2394c98

docs/reference/deprecated_api_list.md

@@ -57,16 +57,12 @@ Should use roctracer/rocTX instead
 ## HIP Texture Management APIs
 
 ### hipGetTextureReference
+### hipGetTextureAlignmentOffset
 ### hipTexRefSetAddressMode
 ### hipTexRefSetArray
 ### hipTexRefSetFilterMode
 ### hipTexRefSetFlags
 ### hipTexRefSetFormat
-### hipBindTexture
-### hipBindTexture2D
-### hipBindTextureToArray
-### hipGetTextureAlignmentOffset
-### hipUnbindTexture
 ### hipTexRefGetAddress
 ### hipTexRefGetAddressMode
 ### hipTexRefGetFilterMode
@@ -85,6 +81,10 @@ Should use roctracer/rocTX instead
 ### hipTexRefSetMipmapLevelBias
 ### hipTexRefSetMipmapLevelClamp
 ### hipTexRefSetMipmappedArray
-### hipBindTextureToMipmappedArray
 ### hipTexRefGetBorderColor
 ### hipTexRefGetArray
+### hipBindTexture
+### hipBindTexture2D
+### hipBindTextureToArray
+### hipUnbindTexture
+### hipBindTextureToMipmappedArray

docs/reference/kernel_language.md

@@ -681,7 +681,7 @@ Users need to include assert.h to use assert. For assert to work in both device
 
 HIP provides the function abort() which can be used to terminate the application when terminal failures are detected.  It is implemented using the `__builtin_trap()` function.
 
-This function produces the effects of using `asm("trap")` in the CUDA code.
+This function produces a similar effect of using `asm("trap")` in the CUDA code.
 
 Note, in HIP, the function terminates the entire application, while in CUDA, `asm("trap")`only terminates the dispatch and the application continues to run.