diff options
| author | Matt Wagantall <mattw@codeaurora.org> | 2015-07-30 17:11:49 -0700 |
|---|---|---|
| committer | Matt Wagantall <mattw@codeaurora.org> | 2015-07-30 17:28:50 -0700 |
| commit | 831dd8391f5633d360f4044630360bff760c3c94 (patch) | |
| tree | 28c0f7c0fd585cab1aceba3d04aa3461bea77563 /MAINTAINERS | |
| parent | 1aa24ca3bad3730e5d6d15523adf59d2a3baa8fb (diff) | |
| parent | 867f900b43f8d571962b4a47035a0af9ebf84461 (diff) | |
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: Matt Wagantall <mattw@codeaurora.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c52b1d6d53c2..bc29fd21a5e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -918,6 +918,14 @@ M: Hubert Feurstein <hubert.feurstein@contec.at> S: Maintained F: arch/arm/mach-ep93xx/micro9.c +ARM/CORESIGHT FRAMEWORK AND DRIVERS +M: Mathieu Poirier <mathieu.poirier@linaro.org> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: drivers/hwtracing/coresight/* +F: Documentation/trace/coresight.txt +F: Documentation/devicetree/bindings/arm/coresight.txt + ARM/CORGI MACHINE SUPPORT M: Richard Purdie <rpurdie@rpsys.net> S: Maintained |