Broken builds

Broken builds

[Russell King - ARM Linux]

Looks like the DSS stuff has broken OMAP builds again during this
merge window:

drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here

Both the OMAP3 and OMAP4 builds break with these two errors.

Re: Broken builds

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> Looks like the DSS stuff has broken OMAP builds again during this
> merge window:
> 
> drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> 
> Both the OMAP3 and OMAP4 builds break with these two errors.

Here's a patch for Tomi to fix this one.

Tony


From: Tony Lindgren <tony@atomide.com>
Date: Tue, 5 Jun 2012 01:20:55 -0700
Subject: [PATCH] OMAPDSS: Fix compile for dss_debugfs_create_file

Otherwise we get:

drivers/video/omap2/dss/core.c:197: error: static declaration of
'dss_debugfs_create_file' follows non-static declaration
drivers/video/omap2/dss/dss.h:166: error: previous declaration of
'dss_debugfs_create_file' was here

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -194,7 +194,7 @@ static inline int dss_initialize_debugfs(void)
 static inline void dss_uninitialize_debugfs(void)
 {
 }
-static inline int dss_debugfs_create_file(const char *name,
+int dss_debugfs_create_file(const char *name,
 		void (*write)(struct seq_file *))
 {
 	return 0;

Re: Broken builds

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]

Hi,

On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> > Looks like the DSS stuff has broken OMAP builds again during this
> > merge window:
> > 
> > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> > 
> > Both the OMAP3 and OMAP4 builds break with these two errors.
> 
> Here's a patch for Tomi to fix this one.

I have a patch for this in my for-rc branch. It just missed the main
merge. I'll send this and a few other fixes today for the next rc.

Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled.
That's why I didn't notice it until too late.

 Tomi


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: Broken builds

[Tony Lindgren]

* Tomi Valkeinen <tomi.valkeinen@ti.com> [120605 06:24]:
> Hi,
> 
> On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> > > Looks like the DSS stuff has broken OMAP builds again during this
> > > merge window:
> > > 
> > > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> > > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> > > 
> > > Both the OMAP3 and OMAP4 builds break with these two errors.
> > 
> > Here's a patch for Tomi to fix this one.
> 
> I have a patch for this in my for-rc branch. It just missed the main
> merge. I'll send this and a few other fixes today for the next rc.
> 
> Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled.
> That's why I didn't notice it until too late.

Tomi, please have your patches sitting in linux next for at least a
week before they get merged. That usually shakes down bugs like these
before the merge window.

Regards,

Tony

Re: Broken builds

[Russell King - ARM Linux]

On Tue, Jun 05, 2012 at 04:20:00PM +0300, Tomi Valkeinen wrote:
> Hi,
> 
> On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> > > Looks like the DSS stuff has broken OMAP builds again during this
> > > merge window:
> > > 
> > > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> > > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> > > 
> > > Both the OMAP3 and OMAP4 builds break with these two errors.
> > 
> > Here's a patch for Tomi to fix this one.
> 
> I have a patch for this in my for-rc branch. It just missed the main
> merge. I'll send this and a few other fixes today for the next rc.
> 
> Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled.
> That's why I didn't notice it until too late.

So... where are we with this?  Apparantly not much further forward;
it seems to be in linux-next but still not in mainline, and mainline
continues to be broken.

Re: Broken builds

[Russell King - ARM Linux]

On Wed, Jun 06, 2012 at 12:58:00AM -0700, Tony Lindgren wrote:
> * Tomi Valkeinen <tomi.valkeinen@ti.com> [120605 06:24]:
> > Hi,
> > 
> > On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote:
> > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> > > > Looks like the DSS stuff has broken OMAP builds again during this
> > > > merge window:
> > > > 
> > > > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> > > > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> > > > 
> > > > Both the OMAP3 and OMAP4 builds break with these two errors.
> > > 
> > > Here's a patch for Tomi to fix this one.
> > 
> > I have a patch for this in my for-rc branch. It just missed the main
> > merge. I'll send this and a few other fixes today for the next rc.
> > 
> > Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled.
> > That's why I didn't notice it until too late.
> 
> Tomi, please have your patches sitting in linux next for at least a
> week before they get merged. That usually shakes down bugs like these
> before the merge window.

Note that tested simple bug fixes _should_ be upstreamed faster than
that where possible - such as this one.

I'm waiting for this to hit mainline before doing any further work on
OMAP.  That basically means I've been totally ignoring OMAP because of
this issue for the last week.

Re: Broken builds

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

On Mon, 2012-06-11 at 17:06 +0100, Russell King - ARM Linux wrote:
> On Tue, Jun 05, 2012 at 04:20:00PM +0300, Tomi Valkeinen wrote:
> > Hi,
> > 
> > On Tue, 2012-06-05 at 01:22 -0700, Tony Lindgren wrote:
> > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [120603 11:05]:
> > > > Looks like the DSS stuff has broken OMAP builds again during this
> > > > merge window:
> > > > 
> > > > drivers/video/omap2/dss/core.c:197: error: static declaration of 'dss_debugfs_create_file' follows non-static declaration
> > > > drivers/video/omap2/dss/dss.h:166: error: previous declaration of 'dss_debugfs_create_file' was here
> > > > 
> > > > Both the OMAP3 and OMAP4 builds break with these two errors.
> > > 
> > > Here's a patch for Tomi to fix this one.
> > 
> > I have a patch for this in my for-rc branch. It just missed the main
> > merge. I'll send this and a few other fixes today for the next rc.
> > 
> > Btw, it compiles if you have debugfs and DSS_DEBUG_SUPPORT enabled.
> > That's why I didn't notice it until too late.
> 
> So... where are we with this?  Apparantly not much further forward;
> it seems to be in linux-next but still not in mainline, and mainline
> continues to be broken.

The fixes have been pulled into fbdev tree, but it missed the -rc2.
Fbdev maintainer said "I merged this some days ago. Sorry that I didn't
realize that rc2 would be released early and hence didn't manage to get
it in."

 Tomi


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: Broken builds

[Tomi Valkeinen]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

On Mon, 2012-06-11 at 17:09 +0100, Russell King - ARM Linux wrote:
> On Wed, Jun 06, 2012 at 12:58:00AM -0700, Tony Lindgren wrote:

> > Tomi, please have your patches sitting in linux next for at least a
> > week before they get merged. That usually shakes down bugs like these
> > before the merge window.
> 
> Note that tested simple bug fixes _should_ be upstreamed faster than
> that where possible - such as this one.
> 
> I'm waiting for this to hit mainline before doing any further work on
> OMAP.  That basically means I've been totally ignoring OMAP because of
> this issue for the last week.

Okay. Perhaps I should have sent the patch directly to Linus, instead of
sending a pull request to fbdev maintainer. There's always a possibility
of delays with intermediate trees.

Then again, I don't see that it's such a big problem that I'd want to
skip the normal route for patches. Sure the bug is annoying, but one can
easily avoid the bug by just enabling CONFIG_DEBUG_FS and
CONFIG_OMAP2_DSS_DEBUG_SUPPORT.

I've now improved my testing process, and I hope things will go smoother
during the next merge window. Sorry about the mess.

 Tomi


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]