Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM:
mach-shmobile: sh73a0: Add IPMMU device") from the iommu tree and commit
486095331af0 ("ARM: mach-shmobile: sh73a0: Minimal setup using DT") from
the
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7740.c between commit f671e0224a7f ("ARM:
mach-shmobile: r8a7740: Add IPMMU device") from the iommu tree and
commits f977ec94f7f2 ("ARM: shmobile: Remove duplicate inclusion of
dma-mapping.h in
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7740.c between commit f671e0224a7f (ARM:
mach-shmobile: r8a7740: Add IPMMU device) from the iommu tree and
commits f977ec94f7f2 (ARM: shmobile: Remove duplicate inclusion of
dma-mapping.h in
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 (ARM:
mach-shmobile: sh73a0: Add IPMMU device) from the iommu tree and commit
486095331af0 (ARM: mach-shmobile: sh73a0: Minimal setup using DT) from
the arm-soc
On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
> I was planning to wait until linux-omap had the changes from iommu
> tree (probably at rc1), if the merge conflict resulted in
> arch/arm/mach-omap2/cclock44xx_data.c still having ipu and dsp clocks,
> in this case the hwmod data changes wouldn't be
Hi Paul,
On Thu, Dec 6, 2012 at 6:59 PM, Paul Walmsley wrote:
> Hi Omar,
>
> On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
>
>> I have checked next-20121206, it's OK to delete that file as the patch
>> from Paul is doing that for common clock framework migration; now the
>> only missing hunk from
Hi Omar,
On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
> I have checked next-20121206, it's OK to delete that file as the patch
> from Paul is doing that for common clock framework migration; now the
> only missing hunk from my original patch should apply to
>
Hi All,
On Tue, Dec 4, 2012 at 5:10 AM, Ohad Ben-Cohen wrote:
> On Tue, Dec 4, 2012 at 1:06 PM, Joerg Roedel wrote:
>> On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
>>> Today's linux-next merge of the arm-soc tree got a conflict in
>>> arch/arm/mach-omap2/clock44xx_data.c
Hi All,
On Tue, Dec 4, 2012 at 5:10 AM, Ohad Ben-Cohen o...@wizery.com wrote:
On Tue, Dec 4, 2012 at 1:06 PM, Joerg Roedel j...@8bytes.org wrote:
On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
Hi Omar,
On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
I have checked next-20121206, it's OK to delete that file as the patch
from Paul is doing that for common clock framework migration; now the
only missing hunk from my original patch should apply to
arch/arm/mach-omap2/cclock44xx_data.c
Hi Paul,
On Thu, Dec 6, 2012 at 6:59 PM, Paul Walmsley p...@pwsan.com wrote:
Hi Omar,
On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
I have checked next-20121206, it's OK to delete that file as the patch
from Paul is doing that for common clock framework migration; now the
only missing hunk
On Thu, 6 Dec 2012, Omar Ramirez Luna wrote:
I was planning to wait until linux-omap had the changes from iommu
tree (probably at rc1), if the merge conflict resulted in
arch/arm/mach-omap2/cclock44xx_data.c still having ipu and dsp clocks,
in this case the hwmod data changes wouldn't be
On Tue, Dec 4, 2012 at 1:06 PM, Joerg Roedel wrote:
> On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
>> OMAP4: hwmod data: ipu and dsp to
On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
> OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
> clocks") from the
On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d (ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks) from the iommu
On Tue, Dec 4, 2012 at 1:06 PM, Joerg Roedel j...@8bytes.org wrote:
On Tue, Dec 04, 2012 at 03:42:03PM +1100, Stephen Rothwell wrote:
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d (ARM:
OMAP4: hwmod data: ipu and
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d ("ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
clock: drop
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/clock44xx_data.c between commit 298ea44f211d (ARM:
OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf
clocks) from the iommu tree and commit 13a5b6228679 (ARM: OMAP44xx:
clock: drop
18 matches
Mail list logo
