From patchwork Wed Jun 29 01:06:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12899133 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 5FAADC433EF for ; Wed, 29 Jun 2022 01:06:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89AA711BBF8; Wed, 29 Jun 2022 01:06:37 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59B3B11BBF5; Wed, 29 Jun 2022 01:06:35 +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 4LXjw50pC7z4xNm; Wed, 29 Jun 2022 11:06:28 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1656464790; bh=1+3MwZKZd2ZjLIsG0nYYRRDCrE/OOrfj/eVPhlnuJgk=; h=Date:From:To:Cc:Subject:From; b=SlJ6I7oKOmch/ygFbgoaGyHouagSM7o6jND0clZbciwc3sklNQbTjQuosDbcwWZK4 HFk2zFbJ9AvGj7RHc+7MrzO0+ZDGOS3AeNl5jOPLQ8A7gM6d2Vc7UTYFBV2BknPXFI mu0LwiXH+YrAi8HR6OrdwZzARYop9+TSFUdc3jb6lOr3f1Dj5J0XHkytGm4cs+T/i5 MnXPeIRJFkdql8HxZH9d1YIrdnTWt6BrgEFTc6zH5wS6v2UV0HNhdvwIolegPtfsaj M03qyzBqpNYavaZpevd6rsPp+ZPPVS9ptte9FWmN5qBVe1DxKhCxXqbn+ySRtrkxmV 2xQ9Af24GDTyA== Date: Wed, 29 Jun 2022 11:06:28 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics Message-ID: <20220629110628.71bef7c7@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , Linux Next Mailing List , Linux Kernel Mailing List , DRI , Dave Stevenson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vc4/vc4_drv.c between commit: 538f11116061 ("drm/vc4: drv: Register a different driver on BCM2711") from Linus' tree and commit: da8e393e23ef ("drm/vc4: drv: Adopt the dma configuration from the HVS or V3D component") 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/vc4/vc4_drv.c index 0f0f0263e744,14a7d529144d..000000000000 --- a/drivers/gpu/drm/vc4/vc4_drv.c