From patchwork Tue Oct 4 02:27:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12997910 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 7D6F8C433FE for ; Tue, 4 Oct 2022 02:27:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E066A10E567; Tue, 4 Oct 2022 02:27:31 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 55F0E10E567 for ; Tue, 4 Oct 2022 02:27:28 +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 4MhM6j3fsFz4xGR; Tue, 4 Oct 2022 13:27:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1664850446; bh=P/VIAOmJpO1XZIvYY8IRtSNZ6UnGWvqi6+0IQ8E6Ix8=; h=Date:From:To:Cc:Subject:From; b=u+ICfgjRDSrmsM8WykUAdauyQdUyeScc2DAmwSfGzNJdYfhZoBViAv/j4PZyyh5wL ke7UlyT+jdvi4Rw54fxCLrJVDa3jS18MHUxdC0qUKGcibMAOUpt8wdJRgd1qzPbarx ydRn/GI9Gs3+A/gpKU91vEqUIUQ519YuujgQrX/+xcBjqkt/lg7YrHkwukukdEFPgU anHn37YS6qOiEKl8j2pfNkHMvHQN20fRmEMlw1giIXdrLVbc87Id3SkQD7Tgzpms6f TNTi4CtZzwpUMoGZA2uew5DXOWplGPbEmqLUzqtb4AhbA8tkx8RiNYFxOJTSKXEOiZ gvUWrawfc/AKA== Date: Tue, 4 Oct 2022 13:27:23 +1100 From: Stephen Rothwell To: Helge Deller , Dave Airlie Subject: linux-next: manual merge of the fbdev tree with the drm tree Message-ID: <20221004132723.7b4b03ab@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: Thomas Zimmermann , ruanjinjie , Linux Next Mailing List , Linux Kernel Mailing List , DRI Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the fbdev tree got a conflict in: drivers/video/fbdev/tridentfb.c between commit: 145eed48de27 ("fbdev: Remove conflicting devices on PCI bus") from the drm tree and commit: d738bf0123d6 ("fbdev: tridentfb: Fix missing pci_disable_device() in probe and remove") from the fbdev 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/video/fbdev/tridentfb.c index f9c3b1d38fc2,4d08f4489a0a..000000000000 --- a/drivers/video/fbdev/tridentfb.c