Merge "diag: Bring diag up to date"
Merge "power: pm8921-bms: Prevent SoC from rising during discharge"
Conflicts:
	drivers/power/pm8921-bms.c
Merge "power: pm8921-bms: restrict soc decrease to one percent"
Conflicts:
	drivers/power/pm8921-bms.c
Merge "power: pm8921-bms: api for battery insertion/removal"
msm_fb: display: fix the hang issue caused by solidfill pipe

When mdp pipe solidfill mode is disabled, the staled pipe info is used
to update mdp pipe regs. This caused mdp hang. Since
mdp4_overlay_rgb_setup function already resets solidfill mode, this
patch removes any pipe register updates that are related to disabling
solidfill mode.

CRs-fixed: 467555
Change-Id: I23f4b29731c9097ab0cc38baa00cd35bc536d2ba
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
Merge "msm: camera: Fix for properly configuring AXI bus when using dual_enabled mode"
Conflicts:
	drivers/media/video/msm/vfe/msm_vfe32.c
Merge "msm_fb: display: get mdp bandwidth parameters from board file"
Conflicts:
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4_overlay.c