conflicts between omap/cleanup branch and omap_dss2 tree

conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

Hi Paul and Tomi,

I'm trying to get the arm-soc tree integrated into linux-next, but right
now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.

I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
depedency and taking Tomi's version of the files, which is probably wrong 
but lets Stephen at least take the arm-soc tree.

Please fix this properly in either the omap or the omap_dss2 trees.

	Arnd

conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

Hi Paul and Tomi,

I'm trying to get the arm-soc tree integrated into linux-next, but right
now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.

I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
depedency and taking Tomi's version of the files, which is probably wrong 
but lets Stephen at least take the arm-soc tree.

Please fix this properly in either the omap or the omap_dss2 trees.

	Arnd

Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [110717 14:36]:
> Hi Paul and Tomi,
> 
> I'm trying to get the arm-soc tree integrated into linux-next, but right
> now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
> and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.
> 
> I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
> depedency and taking Tomi's version of the files, which is probably wrong 
> but lets Stephen at least take the arm-soc tree.

Yes that's the wrong way around for these files..

> Please fix this properly in either the omap or the omap_dss2 trees.

The clock and hwmod data patches should get queued by Benoit and Paul,
so I'm suspecting these are some of Tomi's patches still in development.

Tomi can you please check what you have in for-next?

Regards,

Tony

conflicts between omap/cleanup branch and omap_dss2 tree

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [110717 14:36]:
> Hi Paul and Tomi,
> 
> I'm trying to get the arm-soc tree integrated into linux-next, but right
> now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
> and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.
> 
> I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
> depedency and taking Tomi's version of the files, which is probably wrong 
> but lets Stephen at least take the arm-soc tree.

Yes that's the wrong way around for these files..

> Please fix this properly in either the omap or the omap_dss2 trees.

The clock and hwmod data patches should get queued by Benoit and Paul,
so I'm suspecting these are some of Tomi's patches still in development.

Tomi can you please check what you have in for-next?

Regards,

Tony

Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Archit Taneja]

Hi,

On Monday 18 July 2011 01:38 PM, Tony Lindgren wrote:
> * Arnd Bergmann<arnd@arndb.de>  [110717 14:36]:
>> Hi Paul and Tomi,
>>
>> I'm trying to get the arm-soc tree integrated into linux-next, but right
>> now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
>> and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.
>>
>> I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
>> depedency and taking Tomi's version of the files, which is probably wrong
>> but lets Stephen at least take the arm-soc tree.
>
> Yes that's the wrong way around for these files..
>
>> Please fix this properly in either the omap or the omap_dss2 trees.
>
> The clock and hwmod data patches should get queued by Benoit and Paul,
> so I'm suspecting these are some of Tomi's patches still in development.
>
> Tomi can you please check what you have in for-next?

Tomi is on vacation right now, but he checks his mail once in a while, 
so we may get a response soon.

Tomi's for-next branch is not up to date yet. So it shouldn't be 
considered for now. The HWMOD patches in Tomi's for-next branch will be 
pushed by Paul as 3.1-rc fixes.

We will make a temporary branch which will contain all the DSS2 patches 
which Tomi intended to push for this merge window, once he gets a 
chance, he can quickly update his for-next branch with it.

Archit

>
> Regards,
>
> Tony
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

conflicts between omap/cleanup branch and omap_dss2 tree

[Archit Taneja]

Hi,

On Monday 18 July 2011 01:38 PM, Tony Lindgren wrote:
> * Arnd Bergmann<arnd@arndb.de>  [110717 14:36]:
>> Hi Paul and Tomi,
>>
>> I'm trying to get the arm-soc tree integrated into linux-next, but right
>> now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
>> and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.
>>
>> I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
>> depedency and taking Tomi's version of the files, which is probably wrong
>> but lets Stephen at least take the arm-soc tree.
>
> Yes that's the wrong way around for these files..
>
>> Please fix this properly in either the omap or the omap_dss2 trees.
>
> The clock and hwmod data patches should get queued by Benoit and Paul,
> so I'm suspecting these are some of Tomi's patches still in development.
>
> Tomi can you please check what you have in for-next?

Tomi is on vacation right now, but he checks his mail once in a while, 
so we may get a response soon.

Tomi's for-next branch is not up to date yet. So it shouldn't be 
considered for now. The HWMOD patches in Tomi's for-next branch will be 
pushed by Paul as 3.1-rc fixes.

We will make a temporary branch which will contain all the DSS2 patches 
which Tomi intended to push for this merge window, once he gets a 
chance, he can quickly update his for-next branch with it.

Archit

>
> Regards,
>
> Tony
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

On Tuesday 19 July 2011, Archit Taneja wrote:
> Tomi is on vacation right now, but he checks his mail once in a while, 
> so we may get a response soon.
> 
> Tomi's for-next branch is not up to date yet. So it shouldn't be 
> considered for now. The HWMOD patches in Tomi's for-next branch will be 
> pushed by Paul as 3.1-rc fixes.
> 
> We will make a temporary branch which will contain all the DSS2 patches 
> which Tomi intended to push for this merge window, once he gets a 
> chance, he can quickly update his for-next branch with it.

Ok, just let me know when you upload that branch so I can remove the
dependency from the arm-soc tree. Right now, I'm pulling the
omap_dss2/for_next branch into arm-soc/for_next as a dependency
to resolve the conflict.

	Arnd

conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

On Tuesday 19 July 2011, Archit Taneja wrote:
> Tomi is on vacation right now, but he checks his mail once in a while, 
> so we may get a response soon.
> 
> Tomi's for-next branch is not up to date yet. So it shouldn't be 
> considered for now. The HWMOD patches in Tomi's for-next branch will be 
> pushed by Paul as 3.1-rc fixes.
> 
> We will make a temporary branch which will contain all the DSS2 patches 
> which Tomi intended to push for this merge window, once he gets a 
> chance, he can quickly update his for-next branch with it.

Ok, just let me know when you upload that branch so I can remove the
dependency from the arm-soc tree. Right now, I'm pulling the
omap_dss2/for_next branch into arm-soc/for_next as a dependency
to resolve the conflict.

	Arnd

Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Tomi Valkeinen]

On Tue, 2011-07-19 at 14:59 +0200, Arnd Bergmann wrote:
> On Tuesday 19 July 2011, Archit Taneja wrote:
> > Tomi is on vacation right now, but he checks his mail once in a while, 
> > so we may get a response soon.
> > 
> > Tomi's for-next branch is not up to date yet. So it shouldn't be 
> > considered for now. The HWMOD patches in Tomi's for-next branch will be 
> > pushed by Paul as 3.1-rc fixes.
> > 
> > We will make a temporary branch which will contain all the DSS2 patches 
> > which Tomi intended to push for this merge window, once he gets a 
> > chance, he can quickly update his for-next branch with it.
> 
> Ok, just let me know when you upload that branch so I can remove the
> dependency from the arm-soc tree. Right now, I'm pulling the
> omap_dss2/for_next branch into arm-soc/for_next as a dependency
> to resolve the conflict.

I've pushed a new for-next branch to
git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
decided to just reset it to -rc4 for now.

The latest DSS code does not work without bunch of HWMOD/omap_device
patches so I'm not sure if there's any point to push the code to
linux-next which, afaik, does not currently have those HWMOD/omap_device
patches (Paul, correct me if I'm wrong).

 Tomi

conflicts between omap/cleanup branch and omap_dss2 tree

[Tomi Valkeinen]

On Tue, 2011-07-19 at 14:59 +0200, Arnd Bergmann wrote:
> On Tuesday 19 July 2011, Archit Taneja wrote:
> > Tomi is on vacation right now, but he checks his mail once in a while, 
> > so we may get a response soon.
> > 
> > Tomi's for-next branch is not up to date yet. So it shouldn't be 
> > considered for now. The HWMOD patches in Tomi's for-next branch will be 
> > pushed by Paul as 3.1-rc fixes.
> > 
> > We will make a temporary branch which will contain all the DSS2 patches 
> > which Tomi intended to push for this merge window, once he gets a 
> > chance, he can quickly update his for-next branch with it.
> 
> Ok, just let me know when you upload that branch so I can remove the
> dependency from the arm-soc tree. Right now, I'm pulling the
> omap_dss2/for_next branch into arm-soc/for_next as a dependency
> to resolve the conflict.

I've pushed a new for-next branch to
git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
decided to just reset it to -rc4 for now.

The latest DSS code does not work without bunch of HWMOD/omap_device
patches so I'm not sure if there's any point to push the code to
linux-next which, afaik, does not currently have those HWMOD/omap_device
patches (Paul, correct me if I'm wrong).

 Tomi

Re: conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

On Thursday 21 July 2011, Tomi Valkeinen wrote:
> I've pushed a new for-next branch to
> git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
> decided to just reset it to -rc4 for now.
> 
Ok, thanks!

I've removed the merge with that branch from arm-soc/for-next now.

	Arnd

conflicts between omap/cleanup branch and omap_dss2 tree

[Arnd Bergmann]

On Thursday 21 July 2011, Tomi Valkeinen wrote:
> I've pushed a new for-next branch to
> git://gitorious.org/linux-omap-dss2/linux.git for-next. However, I
> decided to just reset it to -rc4 for now.
> 
Ok, thanks!

I've removed the merge with that branch from arm-soc/for-next now.

	Arnd