* Stephen Rothwell [off-list ref] [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?
 

As an aside, the include of linux/usb/omap_control_usb.h into this file
was removed by commit 608d19380c67 ("ARM: OMAP2+: Remove omap4 pdata for
USB") in the arm-soc tree, but reintroduced by commit 435f4c6d5242
("Merge branch 'next/drivers' into for-next").

Yes omap_control_usb.h is no longer needed either.

Thanks,

Tony