linux-kernel - RE: linux-next: manual merge of the arm-soc tree with the mailbox tree

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] [day] [month] [year] [list]

Message-ID: <37C860A02101E749A747FA2D3C1E3C504CDAAE@DLEE11.ent.ti.com>
Date:	Fri, 21 Jun 2013 16:39:57 +0000
From:	"Anna, Suman" <s-anna@...com>
To:	Tony Lindgren <tony@...mide.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Jassi Brar <jaswinder.singh@...aro.org>
Subject: RE: linux-next: manual merge of the arm-soc tree with the mailbox
 tree

> * Stephen Rothwell <sfr@...b.auug.org.au> [130620 23:14]:
> > Hi all,
> >
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-omap2/devices.c between commit 4a1c0e83bb4e ("ARM:
> OMAP2+:
> > mbox: remove dependencies with soc.h") from the mailbox tree and commit
> > 82c5cde1c4b0 ("ARM: OMAP2+: Remove omap4 ocp2scp pdata") from the arm-
> soc
> > tree.
> >
> > I fixed it up (removing the include of
> > linux/platform_data/omap_ocp2scp.h) and can carry the fix as necessary
> > (no action is required).
> 
> Thanks, that's the right fix as that header won't be needed any longer
> as we've made omap4 device tree only.
> 
> > That mailbox tree commit looks very similar to commit b8a7cf8e2b15 ("ARM:
> > OMAP2+: mbox: remove dependencies with soc.h") from the arm-soc tree ...
> 
> The earlier mailbox branch was merged into arm-soc for a few weeks until
> we decided to drop it as Jassi is working on a more generic API. That was
> merged in commit 51b5f893, then reverted in commit b5c85186. The updated
> mailbox branch accounts for the generic API coming up from Jassi.
> 
> Suman, can you please check if Linux next has mailbox related files merged
> correctly?

Yes, they look good.

Regards
Suman