Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 needed in the patch. OK makes sense. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 my original patch should apply to >> arch/arm/mach-omap2/cclock44xx_data.c which is the file that now has >> ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them >> through linux-omap tree. > > OK, will you add the mach-omap2/omap_hwmod_44xx_data.c changes in the same > patch? 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 needed in the patch. Cheers, Omar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 which is the file that now has > ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them > through linux-omap tree. OK, will you add the mach-omap2/omap_hwmod_44xx_data.c changes in the same patch? - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 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 obsolete clock data") from the arm-soc tree.
>>>
>>> I just deleted the file as the latter did and can carry the fix as
>>> necessary (no action is required).
>>
>> Ohad, Omar, any comment on this?
>
> I'd prefer Omar or Paul to have a look here. Looping in Tony as well.
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 which is the file that now has
ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them
through linux-omap tree.
Cheers,
Omar
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 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 obsolete clock data) from the arm-soc tree. I just deleted the file as the latter did and can carry the fix as necessary (no action is required). Ohad, Omar, any comment on this? I'd prefer Omar or Paul to have a look here. Looping in Tony as well. 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 which is the file that now has ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them through linux-omap tree. Cheers, Omar -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 which is the file that now has ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them through linux-omap tree. OK, will you add the mach-omap2/omap_hwmod_44xx_data.c changes in the same patch? - Paul -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 from my original patch should apply to arch/arm/mach-omap2/cclock44xx_data.c which is the file that now has ipu_fck and dsp_fck (unused) clocks, I can send a patch to remove them through linux-omap tree. OK, will you add the mach-omap2/omap_hwmod_44xx_data.c changes in the same patch? 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 needed in the patch. Cheers, Omar -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 needed in the patch. OK makes sense. - Paul -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 use parent clocks instead of leaf
>> clocks") from the iommu tree and commit 13a5b6228679 ("ARM: OMAP44xx:
>> clock: drop obsolete clock data") from the arm-soc tree.
>>
>> I just deleted the file as the latter did and can carry the fix as
>> necessary (no action is required).
>
> Ohad, Omar, any comment on this?
I'd prefer Omar or Paul to have a look here. Looping in Tony as well.
Ohad.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 tree and commit 13a5b6228679 ("ARM: OMAP44xx:
> clock: drop obsolete clock data") from the arm-soc tree.
>
> I just deleted the file as the latter did and can carry the fix as
> necessary (no action is required).
Ohad, Omar, any comment on this?
Joerg
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 tree and commit 13a5b6228679 (ARM: OMAP44xx: clock: drop obsolete clock data) from the arm-soc tree. I just deleted the file as the latter did and can carry the fix as necessary (no action is required). Ohad, Omar, any comment on this? Joerg -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the iommu tree
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 dsp to use parent clocks instead of leaf clocks) from the iommu tree and commit 13a5b6228679 (ARM: OMAP44xx: clock: drop obsolete clock data) from the arm-soc tree. I just deleted the file as the latter did and can carry the fix as necessary (no action is required). Ohad, Omar, any comment on this? I'd prefer Omar or Paul to have a look here. Looping in Tony as well. Ohad. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
