Conflicts: arch/arm64/configs/vendor/kona_defconfig arch/arm64/configs/vendor/lito_defconfig arch/arm64/include/asm/traps.h drivers/power/supply/qcom/qpnp-smb5.c kernel/sched/sched.h Bug: 151568484 Change-Id: I6ed9ae8bc29d93e42b8527ae25074db334c640da Signed-off-by: Robin Peng <robinpeng@google.com>