Re: [PATCHv2 0/5] OMAP Mailbox framework adoption & DT support
From: Markus Mayer
Date: Mon Jul 14 2014 - 17:19:03 EST
> There are couple of dependent preparatory series. You probably missed
> the following in the cover letter.
>> The series depends on the OMAP mailbox cleanup series  and the
>> refreshed OMAP mailbox DT/hwmod cleanup series .
> As long as you pick the two dependent series, they apply fine on any of
> the 3.16-rcs. I have posted all the series based on 3.16-rc2. Here's a
> merged branch for your reference (not for pulling though, it has one
> additional commit to allow me to test on OMAP2)
> The last 2 patches in the series also depend on the mailbox framework
> patches from Jassi to not throw any build errors if enabled.
That worked. Thanks for the pointer. FYI, there is a minor merge
conflict rebasing the series onto 3.16-rc5.
Applying: ARM: OMAP2+: Avoid mailbox legacy device creation for DT-boot
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Failed to merge in the changes.
Patch failed at 0029 ARM: OMAP2+: Avoid mailbox legacy device creation
That's due to this commit:
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/