Merge "sysctl: Don't scan for the leaks on headers"
Merge "msm: hdmi-cec: bounds check cec frame size"
Merge "msm: hdmi: NUL-terminate spd data"
Merge "msm: scm: Add scm_call_noalloc and helper macros"
Merge "arm: Add ARCH_RANDOM Kconfig"
Conflicts:
	arch/arm/Kconfig
Merge "init: Move stack canary initialization after setup_arch"
Merge "msm: msm_fb: Enable mdp clock before calling mdp_pipe_kickoff_simplified"
Merge "msm_fb: display: Add null check for base layer"
Merge "msm: board-8930-gpiomux: Change gpio config mode"
Merge "msm: kgsl: fix NULL check in kgsl_mem_entry_set_pend()"
Merge "msm: kgsl: Avoid dereferencing NULL pointers"
Merge "msm: kgsl: An error condition could cause an array overflow"
Merge "msm: kgsl Check NULL return from kgsl_get_device_from_dev"
Merge "msm: msm_fb: Do not use ION_IOMMU_UNMAP_DELAYED flag."
Merge "mmc: core: expose HPI capability to SWITCH commands"
Merge "msm: kgsl: Always Signal event time timeline for every event type"
Merge "msm: kgsl: Configure FT behaviour from sysfs instead of debugfs"
Merge "msm: kgsl: Allocate space in ringbuffer for EOF commands"
Merge "msm: kgsl: Init log levels in device init"
Merge "msm: kgsl: Init FT log level in device init"