Hi,
On Fri, 21 Jun 2013 10:24:44 -0500 Suman Anna wrote:
>
> On 06/21/2013 02:36 AM, Arnd Bergmann wrote:
> > On Friday 21 June 2013, Tony Lindgren wrote:
> >>> I wonder if this mess is caused by the fact that I did the revert
> >>> instead of rebuilding our for-next and dropping the merge in the
> * Stephen Rothwell [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:
Stephen,
On 06/21/2013 02:36 AM, Arnd Bergmann wrote:
> On Friday 21 June 2013, Tony Lindgren wrote:
>>> I wonder if this mess is caused by the fact that I did the revert
>>> instead of rebuilding our for-next and dropping the merge in the first
>>> place.
>>>
>>> I'll rebuild our for-next (or may
On 21 June 2013 12:42, Tony Lindgren wrote:
>
> Arnd pulled in tags/omap-for-v3.11/mailbox-signed, which is the branch
> that should get merged to the mainline tree while we're waiting for
> the generic mailbox framework from Jassi.
>
FYKI I, Suman and Loic have been co-ordinating offline. The gen
On Friday 21 June 2013, Tony Lindgren wrote:
> > I wonder if this mess is caused by the fact that I did the revert
> > instead of rebuilding our for-next and dropping the merge in the first
> > place.
> >
> > I'll rebuild our for-next (or maybe Arnd will beat me to it) before
> > next linux-next b
* Olof Johansson [130621 00:07]:
> On Thu, Jun 20, 2013 at 11:53 PM, Tony Lindgren wrote:
> > * Stephen Rothwell [130620 23:48]:
> >> Hi all,
> >>
> >> On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell
> >> wrote:
> >> >
> >> > Today's linux-next merge of the arm-soc tree got a conflict in
>
On Thu, Jun 20, 2013 at 11:53 PM, Tony Lindgren wrote:
> * Stephen Rothwell [130620 23:48]:
>> Hi all,
>>
>> On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell
>> wrote:
>> >
>> > Today's linux-next merge of the arm-soc tree got a conflict in
>> > drivers/mailbox/Kconfig between commit a1824ea
* Stephen Rothwell [130620 23:48]:
> Hi all,
>
> On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell
> 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 th
* Stephen Rothwell [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
Hi all,
On Fri, 21 Jun 2013 16:26:56 +1000 Stephen Rothwell
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/o
Hi all,
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
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/omap_hwmod_44xx_data.c between commit 4a1c0e83bb4e
("ARM: OMAP2+: mbox: remove dependencies with soc.h") from the mailbox
tree and commit 3b9b10151c68 ("ARM: OMAP4: hwmod data: Clean up the data
file") from
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
13 matches
Mail list logo
