Merge remote-tracking branch 'origin/sm7225_s_fp4_target_dev' into HEAD

# Conflicts:
#	arch/arm64/configs/vendor/fp4-perf_defconfig
#	arch/arm64/configs/vendor/fp4_defconfig
#	drivers/android/binder.c
#	drivers/char/adsprpc.c
#	drivers/gpu/msm/kgsl.c
#	drivers/hid/hid-chicony.c
#	drivers/hid/hid-corsair.c
#	drivers/hid/hid-elo.c
#	drivers/hid/hid-holtek-kbd.c
#	drivers/hid/hid-holtek-mouse.c
#	drivers/hid/hid-lg.c
#	drivers/hid/hid-prodikeys.c
#	drivers/hid/hid-roccat-arvo.c
#	drivers/hid/hid-roccat-isku.c
#	drivers/hid/hid-roccat-kone.c
#	drivers/hid/hid-roccat-koneplus.c
#	drivers/hid/hid-roccat-konepure.c
#	drivers/hid/hid-roccat-kovaplus.c
#	drivers/hid/hid-roccat-lua.c
#	drivers/hid/hid-roccat-pyra.c
#	drivers/hid/hid-roccat-ryos.c
#	drivers/hid/hid-roccat-savu.c
#	drivers/hid/hid-samsung.c
#	drivers/hid/hid-uclogic.c
#	drivers/hid/wacom_sys.c
#	drivers/misc/Makefile
#	drivers/mmc/core/block.c
#	drivers/usb/gadget/composite.c
#	drivers/usb/gadget/function/rndis.c
#	drivers/usb/gadget/legacy/dbgp.c
#	fs/aio.c
#	include/linux/hid.h
#	include/linux/wait.h
#	include/uapi/asm-generic/poll.h
#	kernel/sched/wait.c
#	net/sctp/bind_addr.c
#	net/sctp/input.c
#	net/sctp/ipv6.c
#	net/sctp/protocol.c
#	net/sctp/sm_make_chunk.c
#	security/selinux/include/security.h