* conflicts between omap/cleanup branch and omap_dss2 tree
@ 2011-07-17 21:39 Arnd Bergmann
2011-07-18 8:08 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2011-07-17 21:39 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* conflicts between omap/cleanup branch and omap_dss2 tree
2011-07-17 21:39 conflicts between omap/cleanup branch and omap_dss2 tree Arnd Bergmann
@ 2011-07-18 8:08 ` Tony Lindgren
2011-07-19 12:27 ` Archit Taneja
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2011-07-18 8:08 UTC (permalink / raw)
To: linux-arm-kernel
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* conflicts between omap/cleanup branch and omap_dss2 tree
2011-07-18 8:08 ` Tony Lindgren
@ 2011-07-19 12:27 ` Archit Taneja
2011-07-19 12:59 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Archit Taneja @ 2011-07-19 12:27 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* conflicts between omap/cleanup branch and omap_dss2 tree
2011-07-19 12:27 ` Archit Taneja
@ 2011-07-19 12:59 ` Arnd Bergmann
2011-07-21 7:19 ` Tomi Valkeinen
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2011-07-19 12:59 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* conflicts between omap/cleanup branch and omap_dss2 tree
2011-07-19 12:59 ` Arnd Bergmann
@ 2011-07-21 7:19 ` Tomi Valkeinen
2011-07-21 14:20 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Tomi Valkeinen @ 2011-07-21 7:19 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-21 14:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-17 21:39 conflicts between omap/cleanup branch and omap_dss2 tree Arnd Bergmann
2011-07-18 8:08 ` Tony Lindgren
2011-07-19 12:27 ` Archit Taneja
2011-07-19 12:59 ` Arnd Bergmann
2011-07-21 7:19 ` Tomi Valkeinen
2011-07-21 14:20 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).