Hi all,
On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/mailbox/Kconfig between commit a1824eaab70f ("mailbox: OMAP:
> introduce mailbox framework") from the mailbox tree and commit
> c869c75c16b3 ("mailbox/omap: move the OMAP mailbox framework to drivers")
> from the arm-soc tree.
>
> I fixed it up (I suspect not properly - see below) and can carry the fix
> as necessary (no action is required).
>
> It looks like we have two different versions of these changes in
> linux-next now, so please clean it all up. i.e. can I just drop the
> mailbox tree now?
OK, things went steeply downhill from here, so I went back and removed
the mailbox tree ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpTxBOX7JQPF.pgp
Description: PGP signature
