From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D409C4332F for ; Wed, 23 Nov 2022 05:37:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235809AbiKWFhN (ORCPT ); Wed, 23 Nov 2022 00:37:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229717AbiKWFhL (ORCPT ); Wed, 23 Nov 2022 00:37:11 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3CFEF1D88 for ; Tue, 22 Nov 2022 21:36:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669181773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Fm2z95zFBkrJo+OG+cEbfJqfzc4sPwppotEwP4eeDhQ=; b=MVN2Z2UVgS9mxOoyszzzsTJ680zzvTEZXnlG+lp4KtXj7d0dZqSP8Z69At40zR9ye4FRLG +MgFeElJANyrolHk1WH+3aRb+h+YaFXAqz+vVxnSH3Lrx/oRqXESksfe8HwYQD91G4FSoa jenHjGiFShubsr4q/YydS6UtEiOR8pU= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-122-l-yLJv5nPAOxQ7dwmaGGyA-1; Wed, 23 Nov 2022 00:36:04 -0500 X-MC-Unique: l-yLJv5nPAOxQ7dwmaGGyA-1 Received: by mail-lf1-f69.google.com with SMTP id l7-20020a19c207000000b004a471b5cbabso6158797lfc.18 for ; Tue, 22 Nov 2022 21:36:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fm2z95zFBkrJo+OG+cEbfJqfzc4sPwppotEwP4eeDhQ=; b=ZXcAlaVaUYE4brCq3kLsc/28VabOPAJDmSkiLRD3GSixEw47/fXowKbw2M+gREGRa3 sOiZfQwqvodfn6ZSG4xLLtYatdpValc6cHIoQgVrYLfHilsv/KH1oiseDZgCdIBYwtov LWeRobJpfhraErrcrNdOnUuqkqpx6l/4GTHcc+HTZbRP7IUuWFzXnZHzfHxWLX2Ey2rR Hz5IsC2kuHe9VDO/aIZ9vfjRBy/qatIhlhqA0qO8M8KEVYrqvmrKqaDsmYb9jCP2R1Tm tuPl0zjJuxHHvB8o75LH4PiAo0l8lYZ8b+uSPes0/gy6ChKfHrqI8BhTTJCTxepC6v9N 3Hpg== X-Gm-Message-State: ANoB5pkC3gJkrkwf3RYfAxLbZqkdhZG+4AHz8WBv9s0EqtdmxknLblb8 KtO0qnceoFzIJ2kR5cxwXeIyhNhDga/fOIwAZStDi5uuSgUKNpdCxWKsFtritNowsJAm+/BLnJD /Y78BKqAsesY/vEBw4nQTZ7ib7ScnogQkHQPDDAHm X-Received: by 2002:ac2:5921:0:b0:4b3:cdf5:93f3 with SMTP id v1-20020ac25921000000b004b3cdf593f3mr8507177lfi.99.1669181762608; Tue, 22 Nov 2022 21:36:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf7EmAdgaB8z6/XlFfL3GYcrmaPlXFkV2QFwJYrqaxkfAnHDIeaFh8pRTCR3xvg4c2PyDsw5HZNh73j3bDrQq70= X-Received: by 2002:ac2:5921:0:b0:4b3:cdf5:93f3 with SMTP id v1-20020ac25921000000b004b3cdf593f3mr8507165lfi.99.1669181762300; Tue, 22 Nov 2022 21:36:02 -0800 (PST) MIME-Version: 1.0 References: <20221117183214.2473e745@canb.auug.org.au> <20221123162033.02910a5a@canb.auug.org.au> In-Reply-To: <20221123162033.02910a5a@canb.auug.org.au> From: David Airlie Date: Wed, 23 Nov 2022 15:35:50 +1000 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Cc: Daniel Vetter , Thomas Zimmermann , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 23, 2022 at 3:21 PM Stephen Rothwell wrote: > > Hi all, > > On Thu, 17 Nov 2022 18:32:14 +1100 Stephen Rothwell wrote: > > > > 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 > > Date: Thu, 17 Nov 2022 18:19:22 +1100 > > Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter" > > > > Signed-off-by: Stephen Rothwell > > --- > > 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; > > } > > -- > > 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.