[lkml]   [2011]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the arm-soc tree with the arm tree
On Tue, Oct 25, 2011 at 07:45:32AM +1100, Stephen Rothwell wrote:
> Hi Arnd,
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-exynos4/include/mach/entry-macro.S between commit
> 292b293ceef2 ("ARM: gic: consolidate PPI handling") from the arm tree and
> commit 3a0622811292 ("ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212")
> from the arm-soc tree.
> Again, I hacked it up (again probably incorrectly - I kept both
> additions).

Argh, noooo, not another conflict.
It looks like merging the PPI stuff was a bad move (despite pressure from
tglx to do so.) Unfortunately, it's in my published stable branch so it
can't be dropped.

Russell King
Linux kernel 2.6 ARM Linux -
maintainer of:

 \ /
  Last update: 2011-10-24 22:55    [from the cache]
©2003-2011 Jasper Spaans