Merge "USB: ks_bridge: Fix PM usage counter mismatch"
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/video/msm/vidc/common/dec/vdec.c
Merge "USB: ci13xxx_udc: Don't flush inactive endpoints"
Conflicts:
	drivers/usb/gadget/ci13xxx_udc.c
Merge "USB: ci13xxx_udc: Don't flush inactive endpoints"
Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako-pmic.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/video/msm/vidc/common/dec/vdec.c
Merge "USB: ci13xxx_udc: Skip flushing endpoints upon failure"
media: dvb: mpq: Fix mutex release

Mutex should be released only if the function locked it
at the beginning.

Change-Id: If83d615a1777a1ccb2a13d070e1b67d002662cb8
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
msm: vidc: Fix various NULL pointer accesses, memory leaks.

This commit fixes various NULL pointer and memory leak bugs.

Change-Id: I3b3ac40b5e440b9665858913921a06de14741b6f
Signed-off-by: Rajeshwar Kurapaty <rkurapat@codeaurora.org>

Conflicts:
	drivers/video/msm/vidc/common/enc/venc.c
msm: kgsl: Add minimum amount of wait in adreno_waittimestamp

Add minimum amount of wait period in adreno_waittimestamp
to avoid instances of malformed wait period (such as msecs=0)
arguments from userspace and in turn avoid false hang detections.

CRs-fixed: 437738
Change-Id: I5cd40dc7589747e7fffeb6d5cc2001b73d6d845e
Signed-off-by: Harsh Vardhan Dwivedi <hdwivedi@codeaurora.org>

Conflicts:
	drivers/gpu/msm/adreno.c
msm: power: update copyright markings

In cherry-picking patches from tip, the LTC charger driver and pm8921
BMS driver header were updated without updating the copyright
marking from "Code Aurora Forum" to "The Linux Foundation".

Fix this by updating the copyrights now

Change-Id: I3a24feaa6af5acbdca4fc6499398205a1c93dcfe
Signed-off-by: Xiaozhe Shi <xiaozhes@codeaurora.org>
coresight: split qdss config to more granular coresight configs

Change CONFIG_MSM_QDSS to granular CORESIGHT configs covering
various CoreSight drivers. This better represents the CoreSight
device topology and allows more flexibility in choosing the
drivers required for a particular platform or chip.

Conflicts:

	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/configs/msm8974-perf_defconfig
	arch/arm/configs/msm8974_defconfig
	arch/arm/configs/msm9625_defconfig
	arch/arm/mach-msm/Kconfig
	drivers/coresight/Kconfig
	drivers/coresight/Makefile
	drivers/coresight/coresight-etm.c
	drivers/coresight/coresight-priv.h

Change-Id: I5ae44442c24c88673f2045ad24dc89e4d86d23cb
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	drivers/Makefile
	drivers/coresight/Makefile
coresight: support for etr to usb output

Support for etr to usb trace output using QDSS BAM to USB BAM
transfers.

Change-Id: Ibb6f8d0cf1d9799668cb22ccaa13966139c8dea5
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	drivers/coresight/coresight-priv.h
coresight: DT support for etr to usb output on 8974

Add coresight CSR (CoreSight Slave Registers) device and BAM register
definition for TMC-ETR to support ETR to USB output.

Change-Id: I1f9081a0a684a9a6d5b08361be1e09c323a2d4fe
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	arch/arm/boot/dts/msm8974-coresight.dtsi
coresight: don't directly log printk to STM

Since we can use ftrace event to also log printk to STM, remove
direct logging of printk to STM.

Change-Id: I903e2584b40565513342864827455f0a6cbf2260
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	include/linux/coresight-stm.h
coresight: only use etm0 for populating configuration

With maxcpus=1, only core0 will be running with other cores in
reset until they are explicitly hotplugged on. To avoid reading
ETM registers for cores that are in reset during probe, use only
ETM0 for populating configuration info. For other ETM probes,
copy the info from ETM0.

Change-Id: I9ae4539b004956a026e919323413f9e3c7d5ba4a
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	drivers/coresight/coresight-etm.c
coresight: change to using smp call for etm enable/disable

Since we moved to separate enable nodes for each ETM, using pm_qos
to prevent power collapse of the target cpu while we enable or
disable ETM is less efficient and also susceptible to a race with
cpu hotplug.

Move to using smp call to enable and disable trace to avoid above
deficiencies with the newly re-structured code.

Change-Id: I65c726dbd6275af8db0d40db5034299287a02e91
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	drivers/coresight/coresight-etm.c
coresight: implement crash dumping support

Add support to allow debug image to be able to dump ETF content
and ETM, TMC regsiters in case of apps proc bite or system hang
causing secure watchdog reset.

This will enable host parsing scripts to extract ETF and
ETR-memory trace data contents from RAM dumps.

Change-Id: Ie6f03bef7b4ccda7ea8d7709ee0c4808424c5b92
Signed-off-by: Pratik Patel <pratikp@codeaurora.org>

Conflicts:
	drivers/coresight/coresight-etm.c
	drivers/coresight/coresight-tmc.c
coresight: simplify etm_init_arch_data

Move etm_arch_supported out of etm_init_arch_data to simplify the
init flow.

Signed-off-by: Pratik Patel <pratikp@codeaurora.org>
Change-Id: I8a95f59e35e74c5af8c447abdc9f0dcd1682bce1

Conflicts:
	drivers/coresight/coresight-etm.c