From patchwork Fri Jan 27 02:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13118133 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10AEAC54EAA for ; Fri, 27 Jan 2023 02:28:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C2AD10E16B; Fri, 27 Jan 2023 02:28:14 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2D3210E0E6; Fri, 27 Jan 2023 02:28:11 +0000 (UTC) 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 4P31hP2vbqz4xN1; Fri, 27 Jan 2023 13:28:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674786486; bh=DvR++yNqf5j2bKXvDXzXqvFKPNIHalGVvCBtT8bOoKs=; h=Date:From:To:Cc:Subject:From; b=GuBKfdcHIyWWLQm2TG/hdPWQJ1Zw4xMb7Bi6F3LttJfzp4TOdvZS7+uO/Th1rhA/r VR5GeucHuY6NT5i1Iusvm46wYTz3qrpgnUZMd0e3cZDW2eL9bmVJ9Wk6Y+mQKiDPNw ac1hLShhQKv4n4f1DmkdpRqWZcVc887PNGFnVyi9P9YCU4zx6jei224pavk2wwmuRZ iutQmvGtJSrNHxgr1VyKfks3lKhdXGMCvnDOArvNVk6WQR3yr8Y9HWMrSO/IkyJeM9 jdyLYo6UeIK8JYvz1xhgqxBfpRnE3Jf/WLlHX+PQdV/xCkoA6O+WW7fu1uo8WXrR8h Xvjt7ONz1cz4A== Date: Fri, 27 Jan 2023 13:28:04 +1100 From: Stephen Rothwell To: Daniel Vetter Subject: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Message-ID: <20230127132804.636960bb@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel Graphics , Javier Martinez Canillas , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/drm_fbdev_generic.c between commits: cc88ad784e42 ("drm/fb-helper: Check fb_deferred_io_init() return value") d6591da5f3ff ("drm/fb-helper: Use a per-driver FB deferred I/O handler") from the drm-misc-fixes tree and commit: 6ca80b9e5cc0 ("drm/fbdev-generic: Rename struct fb_info 'fbi' to 'info'") from the drm-misc tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/drm_fbdev_generic.c index bd1f8f28297c,43f94aa9e015..000000000000 --- a/drivers/gpu/drm/drm_fbdev_generic.c