Conflicts:
Makefile
drivers/media/platform/msm/camera/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c
drivers/power/supply/qcom/qpnp-smb2.c
fs/crypto/crypto.c
fs/crypto/policy.c
Changed arch/arm64/boot/dts/google/sdm845-b1c1-memory.dtsi to accomodate
for new memory layout in arch/arm64/boot/dts/qcom/sdm845.dtsi
Change-Id: Ibb6fbf95bd1f8fba142e77807cce42cde5f793a2
be2cbbae8c