Merge tag 'LA.UM.8.4.r1-04700-8x98.0' of https://source.codeaurora.org/quic/la/kernel...

"LA.UM.8.4.r1-04700-8x98.0"

diff --cc arch/arm64/kernel/asm-offsets.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/staging/android/ion/ion_system_heap.c
Simple merge

diff --cc drivers/usb/gadget/configfs.c
Simple merge

diff --cc include/linux/arm-smccc.h
Simple merge