On 09/14/2012 01:12 PM, Arnd Bergmann wrote:
On Friday 14 September 2012, Sachin Kamat wrote:
Hi Andrey,
On 12 September 2012 17:56, Andrey Konovalov andrey.konovalov@linaro.org wrote:
Greetings,
The linux-linaro-core-tracking (llct) tree has been moved to v3.6-rc5 base. All the topics existed in the 12.08 version of llct have been carried over into the updated tree with few easy to resolve conflicts. The only one which needs attention is due to commit "ASoC: Samsung: Fix build error" [1]. In fact I had to revert it because it doesn't work with the multiplatform topic (the latter renames all the arch/arm/mach-<name>/include/mach dirs to arch/arm/mach-<name>/include/mach-<name>). Sachin or Tushar, could you take a look please?
CC'd Arnd.
<mach/dma.h> present in some Samsung driver files esp. related to audio haven't been converted to <mach-<name>/dma.h> form mainly because most Samsung mach-* directories have a dma.h file and those need to be consolidated first. Kukjin's team is working on cleaning this up. See the below link
http://permalink.gmane.org/gmane.linux.kernel.samsung-soc/12049
With the fix patch reverted, you will get build errors if you enable pcm. However if you do not intend to enable pcm you may go ahead with it. Alternatively, you may replace <mach/dma.h> with <mach-exynos/dma.h> for your purpose (stopgap solution).
I think we need to discuss whether the multiplatform branch should still be included in the linux-linaro-core-tracking tree. At the ARM mini summit in San Diego, we discussed in length about how we want to get to actual multiplatform kernels, and decided *not* to use my testing/mach-headers branch. We could keep using it for a little longer, but I think eventually we will have do thing differently as upstream moves on, so we might decide to remove it right away.
Guess I'll make one or couple more linux-linaro-core-tracking tree updates using the "replace <mach/dma.h> with <mach-exynos/dma.h>" workaround just in case, and then drop the multiplatform from the following linux-linaro-core-tracking tree updates starting from Tuesday, Sept 18. (So that we could use any of the two variants for the 12.09) Does anyone mind?
Thanks, Andrey
Arnd