From patchwork Thu Nov 10 00:10:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 17873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp634863wru; Wed, 9 Nov 2022 16:13:31 -0800 (PST) X-Google-Smtp-Source: AMsMyM4Yc5xGVwyPQtWnAddwNQgN2PSPQ/2gwPPX831LP6BRR5Pv3MSeelaWFoQsAhAlz19A2EJR X-Received: by 2002:a63:ea0f:0:b0:46e:c9e2:f11b with SMTP id c15-20020a63ea0f000000b0046ec9e2f11bmr1410008pgi.151.1668039211127; Wed, 09 Nov 2022 16:13:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668039211; cv=none; d=google.com; s=arc-20160816; b=FPsiE2FsQzpE9i19P9/3BidBLyw14O8x6B0KsiEmeSsPd1BNZpJtq8U8sweGIOPzyQ xDVz9Ze5Qf0yT3d4IAdZzkUqy5cMITP1fy51qc0twPk9mkcepajTyTdCoNT1tA9KI82/ v0a36r9eAMK614Wi8m7XA9ZELWDU4dqWK6kWiIeqis2mI7MKyouGDV/jBwCA1Xq65rgv gDFFalVJeGACAIVdtvRjpW52fkTtbGcuIo0WHkR8uIk6evNufPQjN1fDvCj3wL3h5Gqw 3p7xiJXny92sMYUqKpVLboHlTnWoPM4YqA3Vx2Vlg17B5zyFa1r/87ZUlpC65cbe2Fxc sg0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=7NJVAvlEwmwSk1lEugHbvaQ3Djwk5pg2l77rzitW5zU=; b=rnHKvlkIlz0LXwF+uwlvzJrDiFW4+nQZ0J0os0hh30dHB5j0H2PolL7LZl9QrRFVH2 f1R25a2n5QU4XAylNER0IWp44/tk5CV3xlP59dVI2gdOM0WCTDARWN7M66q5Nwc5WinF 6zwxlOPzoTWbYvs+6Xl9rNiTRAySQlTmUDeco4MaJPE3eLBUZcK3oFZJFJzZf7c96g4i gyvnH1Ku+Y/tSdPS+yhnwvL3jOk/aTbYQNQ7aPbexDskrxU0zma6fc05ypWCRjKHuBe+ /rVhOIPClvhONY1VchFS8ep6gMgi6EnAgYxWTUpHItNUWtEbWXAO8DjobPybMHBViFCi oEpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HbzjsAiT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cl14-20020a17090af68e00b001f2757da25asi2460353pjb.91.2022.11.09.16.13.16; Wed, 09 Nov 2022 16:13:31 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=HbzjsAiT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231996AbiKJAKm (ORCPT + 99 others); Wed, 9 Nov 2022 19:10:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiKJAKl (ORCPT ); Wed, 9 Nov 2022 19:10:41 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E429365EC; Wed, 9 Nov 2022 16:10:39 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N72Kp0Kyvz4xGT; Thu, 10 Nov 2022 11:10:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668039038; bh=7NJVAvlEwmwSk1lEugHbvaQ3Djwk5pg2l77rzitW5zU=; h=Date:From:To:Cc:Subject:From; b=HbzjsAiTjm/cDpadZMmcAhg5e5Op/A/JZ6p+JTAv8DnAAZsuzx/0TWHqN7b9Q9sWq rxuAmcaABF3Syj9SyrIsLgEiZnHoshquZ4RkTrGdGanv8XT+pZ3hVrP5VWW2nmihku s7gT7B6MtOdrFtOQS9if4QhZIt/puLJbSYh8FNjXxof7uixLLlGtYkORLpJNt2LMPC mEHROv3V5PutaXXNQ40LxWLzN1ql46WmCkrx9hveBwotHpJMnt7hmVWzBt6QvnK1Vf ucGC3A7LU1xrgn4qwPWtMEHnHaRPPoebCjzoLr6viODVtgwcRVCURWYWrDQyZKZ3Mg EJkU20XZvbJ6Q== Date: Thu, 10 Nov 2022 11:10:36 +1100 From: Stephen Rothwell To: Daniel Vetter , Dave Airlie Cc: Ben Skeggs , Thomas Zimmermann , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20221110111036.63cb67d1@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749065884257856439?= X-GMAIL-MSGID: =?utf-8?q?1749065884257856439?= Hi all, After merging the drm-misc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/nouveau/nouveau_drm.c: In function 'nouveau_drm_probe': drivers/gpu/drm/nouveau/nouveau_drm.c:797:17: error: implicit declaration of function 'drm_fbdev_generic_setup' [-Werror=implicit-function-declaration] 797 | drm_fbdev_generic_setup(drm_dev, 8); | ^~~~~~~~~~~~~~~~~~~~~~~ Caused by commit 8ab59da26bc0 ("drm/fb-helper: Move generic fbdev emulation into separate source file") interacting with commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers") from the drm tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Thu, 10 Nov 2022 11:05:52 +1100 Subject: [PATCH] drm-misc: fix up for "drm/fb-helper: Move generic fbdev emulation into separate source file" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index a19f18b251f3..80f154b6adab 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include