Re: conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-21 Thread 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

Re: conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-21 Thread 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 -- To

Re: conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-19 Thread Archit Taneja
Hi, On Monday 18 July 2011 01:38 PM, Tony Lindgren wrote: * Arnd Bergmanna...@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

Re: conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-19 Thread 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

Re: conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-18 Thread Tony Lindgren
* Arnd Bergmann a...@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

conflicts between omap/cleanup branch and omap_dss2 tree

2011-07-17 Thread 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