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:   Wed, 23 Nov 2022 16:20:33 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Dave Airlie <airlied@redhat.com>
Cc:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        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: Re: linux-next: build failure after merge of the drm-misc tree
Message-ID: <20221123162033.02910a5a@canb.auug.org.au>
In-Reply-To: <20221117183214.2473e745@canb.auug.org.au>
References: <20221117183214.2473e745@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QdkUDVBl0GM8MmuvnPiUWNp";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> After merging the drm-misc tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>=20
> ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disable=
d':
> 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_disabl=
ed':
> 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_disab=
led':
> fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'=
; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined he=
re
> ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabl=
ed':
> modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'=
; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined he=
re
> ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disable=
d':
> fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; dr=
ivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here
>=20
> Caused by commit
>=20
>   0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter")
>=20
> This build does not have CONFIG_VIDEO_NOMODESET set.
>=20
> I applied the following patch for today.
>=20
> From 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 =
parameter"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/linux/fb.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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

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...

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN9raEACgkQAVBC80lX
0GwzsAf9FsX728ujmxJyRH1r6NH3/BtmZR7MmvHvSTVE2C+UOUjNQ/QPGgna2Wtl
G2Yt6ZPTSci350K2x6ISaAjVKwsLBACSyhgHddeKWz72ZEwB63MQUjGFC/Ql5L+a
M+GJASmOeExAd2i06E29dCV2XTBeV+2Iw+QhmotpsBtjjdFxoAmJv5KrJzzNtBpJ
CSdqCZzCBI6ClGRTK1J2gQ4KVUaCPvMQPHMMmy+/VMKrFiH5AjwATHdFX1VhbIEA
FfKwCCdarYnbW+L1tvOWogD2XEiasOnuJOvvxCOJqSUgHKTXfVbXRF74Ujo5NWGo
cGptfJ//Al8NmnLeppXRHtaj23tFRw==
=+ny7
-----END PGP SIGNATURE-----

--Sig_/QdkUDVBl0GM8MmuvnPiUWNp--