Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831dd839 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge branch 'lsk/v3.18/topic/coresight' into 'msm-3.18'



Merging the Linaro Stable Kernel (LSK) linux-linaro-lsk-v3.18
brings in a diverged version of the coresight driver, which
conflicts significantly with version currently being used
for MSM chipsets.

For the time being, let both versions of the driver live
side-by-side. The internal version remains in
drivers/coresight, and the external version at
drivers/hwtracing/coresight. This should reduce future
merge conflicts until the two drivers can be unified.

The Makefile and Kconfig 'includes' for the upstream
version are intentionally dropped for now (since they
conflict with the internal versions), and a little header
magic is added to the top of include/linux/coresight.h
to point to include/linux/coresight_msm.h for ARCH_MSM.

Conflicts:
	arch/arm/include/asm/hardware/cp14.h
	arch/arm/Kconfig.debug
	arch/arm64/Kconfig.debug
	drivers/Makefile
	include/linux/coresight.h

Change-Id: I06c4ef22b9a5bfb44f17d27b0a704c9f56fe351f
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents 1aa24ca3 867f900b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment