Conflicts: arch/arm64/configs/vendor/kona_defconfig drivers/char/adsprpc.c drivers/dma-buf/dma-buf.c drivers/firmware/qcom/tz_log.c drivers/hid/hid-holtek-mouse.c drivers/mmc/host/cqhci-crypto-qti.c drivers/soc/qcom/qmi_rmnet.c drivers/usb/gadget/composite.c drivers/usb/gadget/function/f_uac1.c drivers/usb/gadget/function/rndis.c fs/f2fs/super.c net/sctp/input.c Bug: 253163588 Change-Id: Ie21081a2d496960b56a3a2ac9cb6c45e285e698e Signed-off-by: JohnnLee <johnnlee@google.com>