Skip to contentSkip to conversation

linux-next: build failure after merge of the drm-misc tree

PATCH Stephen Rothwell 4 participants 6 messages Nov 17, 2022 – Nov 23, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi all,

After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this:

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

Caused by commit

0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")

This build does not have CONFIG_VIDEO_NOMODESET set.

I applied the following patch for today.

From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email protected]>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"

---
 include/linux/fb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b1..ea421724f733 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
 #if defined(CONFIG_VIDEO_NOMODESET)
 bool fb_modesetting_disabled(const char *drvname);
 #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
 {
 	return false;
 }
Signature · 5 lines
2.35.1

-- 
Cheers,
Stephen Rothwell
#1 lore raw

[Intel-gfx] ✗ Fi.CI.BUILD: failure for linux-next: build failure after merge of the drm-misc tree

== Series Details ==

== Series Details ==

Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/111006/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/111006/revisions/1/mbox/ not applied Patch is empty.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To record the empty patch as an empty commit, run "git am --allow-empty".
To restore the original branch and stop patching, run "git am --abort".

#2 lore raw
In reply to Stephen Rothwell

Hi all,

Quoted 48 lines · On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <[email protected]>…

After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this:

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

Caused by commit

0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")

This build does not have CONFIG_VIDEO_NOMODESET set.

I applied the following patch for today.

From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email protected]>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"

---
 include/linux/fb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b1..ea421724f733 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
 #if defined(CONFIG_VIDEO_NOMODESET)
 bool fb_modesetting_disabled(const char *drvname);
 #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
 {
 	return false;
 }
Signature · 1 line
2.35.1

This commit went away for a couple of linux-next releases, but now has reappeared in the drm tree :-( What went wrong?

I have reapplied the above patch...

Signature · 2 lines
Cheers,
Stephen Rothwell
#3 lore raw
Quoted 47 lines · Stephen Rothwell

Hi all,

Quoted 43 lines · On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <[email protected]>…

After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this:

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

Caused by commit

0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")

This build does not have CONFIG_VIDEO_NOMODESET set.

I applied the following patch for today.

From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email protected]>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"

---
 include/linux/fb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b1..ea421724f733 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
 #if defined(CONFIG_VIDEO_NOMODESET)
 bool fb_modesetting_disabled(const char *drvname);
 #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
Quoted 8 lines
Quoted 5 lines
include/linux/fb.h +0 -1
 {
      return false;
 }
--

2.35.1

This commit went away for a couple of linux-next releases, but now has reappeared in the drm tree :-( What went wrong?

Nothing gone wrong as such, just the drm-misc-next pull request was sent on a regular weekly cadence, then I merged it a few days later. The fix for this is still in the drm-misc-next queue for the next PR which I will get this week.

Dave.

#4 lore raw

Hi Dave,

Quoted 5 lines · On Wed, 23 Nov 2022 15:35:50 +1000 David Airlie <[email protected]> wrote:

Nothing gone wrong as such, just the drm-misc-next pull request was sent on a regular weekly cadence, then I merged it a few days later. The fix for this is still in the drm-misc-next queue for the next PR which I will get this week.

There is nothing currently in the drm-misc tree in linux-next (relative to the drm tree). And there was never a fix in there for this problem, the commit was just removed when I reported it.

If there was a fix for this in the drm-misc tree, I would not have seen the build failure.

Signature · 2 lines
Cheers,
Stephen Rothwell
#5 lore raw
In reply to David Airlie

Hi

Am 23.11.22 um 06:35 schrieb David Airlie:

Quoted 57 lines · Stephen Rothwell
Quoted 47 lines

Hi all,

Quoted 43 lines · On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <[email protected]>…

After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this:

ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled':
fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled':
fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled':
fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled':
modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled':
fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here

Caused by commit

0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")

This build does not have CONFIG_VIDEO_NOMODESET set.

I applied the following patch for today.

From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <[email protected]>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter"

---
  include/linux/fb.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/fb.h +1 -1
index 3a822e4357b1..ea421724f733 100644
@@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,
  #if defined(CONFIG_VIDEO_NOMODESET)
  bool fb_modesetting_disabled(const char *drvname);
  #else
-bool fb_modesetting_disabled(const char *drvname)
+static inline bool fb_modesetting_disabled(const char *drvname)
Quoted 8 lines
Quoted 5 lines
include/linux/fb.h +0 -1
  {
       return false;
  }
--

2.35.1

This commit went away for a couple of linux-next releases, but now has reappeared in the drm tree :-( What went wrong?

Quoted 4 lines

Nothing gone wrong as such, just the drm-misc-next pull request was sent on a regular weekly cadence, then I merged it a few days later. The fix for this is still in the drm-misc-next queue for the next PR which I will get this week.

The next PR should be drm-misc-next-fixes. FYI I forwarded the tree and cherry-picked the patch from drm-misc-next.

Best regards
Thomas

Quoted 3 lines

Dave.

Signature · 6 lines
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev