Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 17 Nov 2022 18:32:14 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Daniel Vetter <daniel.vetter@ffwll.ch>
Cc:     Thomas Zimmermann <tzimmermann@suse.de>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the drm-misc tree
Message-ID: <20221117183214.2473e745@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wjNg7IVu0VNo1vCy4/HXkgH";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/wjNg7IVu0VNo1vCy4/HXkgH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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'; dr=
ivers/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'; d=
rivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disable=
d':
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'; driv=
ers/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.

=46rom 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Nov 2022 18:19:22 +1100
Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel pa=
rameter"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/fb.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 3a822e4357b1..ea421724f733 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -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;
 }
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/wjNg7IVu0VNo1vCy4/HXkgH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN1434ACgkQAVBC80lX
0Gy73gf/bE1WqkOYNnd03HSmw1cf24Ym206L30fBc7j1ARYlcmBfl/RBOwERxccN
rtP7JkTzYkOI1lcGwSqWkzUUf4Y8SK0z4ZawWnXJ3OIyN8PMC6fjrFQBAvjvuB3l
wYnRs/a2E+kj7bijRu6Ad/oF3BXJ/oXY8vC85MNz/1NQmFxLOitpghLuXu0obG7P
bhjmG/LddlNVgUjkyNijTqH9Dm+DID2+zfOd67Z93OUs2Rm0wteJdRaneRXXmcuI
0OBL0y67tstzrAYCGEQRoqJTWKA/GDlIkvBcHpnTL5Vl8COZBukwu7OY8CipO+ym
z6fSdt1WjmGNOG0KetVbrxPa2Kx1iQ==
=L3k7
-----END PGP SIGNATURE-----

--Sig_/wjNg7IVu0VNo1vCy4/HXkgH--