linux-kernel - Re: [PATCHv2 0/5] OMAP Mailbox framework adoption & DT support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 14 Jul 2014 14:18:54 -0700
From:	Markus Mayer <markus.mayer@...aro.org>
To:	Suman Anna <s-anna@...com>
Cc:	Tony Lindgren <tony@...mide.com>,
	Jassi Brar <jaswinder.singh@...aro.org>,
	Dave Gerlach <d-gerlach@...com>, Pavel Machek <pavel@....cz>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	linux-omap@...r.kernel.org,
	Device Tree List <devicetree@...r.kernel.org>,
	ARM Kernel List <linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCHv2 0/5] OMAP Mailbox framework adoption & DT support

Hi Suman,

> 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 [5] and the
>> refreshed OMAP mailbox DT/hwmod cleanup series [2].
>
> 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)
> https://github.com/sumananna/mailbox/commits/submit/3.16-rc2-omap-mbox-v8-fwk-v2
>
> 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...
M arch/arm/mach-omap2/devices.c
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-omap2/devices.c
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
for DT-boot

That's due to this commit:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1d29a0722f6c38f79785c9ffb911730598de84e2

Regards,
-Markus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/