From patchwork Mon Feb 28 03:17:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12762349 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 D2421C433FE for ; Mon, 28 Feb 2022 03:18:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E70010E11A; Mon, 28 Feb 2022 03:18:07 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id A163010E11A for ; Mon, 28 Feb 2022 03:18:05 +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 4K6QYc4T1lz4xcZ; Mon, 28 Feb 2022 14:17:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1646018280; bh=lvFotgi2nbWrax1SqwtUR3EuEokM47rQLD5f0//Rv2s=; h=Date:From:To:Cc:Subject:From; b=hAFB+X+e835Rluh1PCYMjeKlXa/xFFQho/aRuOCh/Ft9eO8h1U7YsEC3JG0zeZcj+ XLkBdPIBu8qKbJQWJokqNTZZXwaJjmJproOQIwFY52YUdJ6DwaQQMANzSmVF/moDvu KwOCIhLMHtBeiVR0GG91aa4dvb3wXSFyz1zzrDJauNpH51BrWoHCmFSRuC8YLlGv4N ObVxiZgYcos9DbH32+GJK4Lp8RxZwbAcTFvnx50S36MR2SQbEScddINI1zltBs7LVa tCLwXgV4xdQocvbG34ypz8luc9kIYBChpbHjJE8D6oHBgi8MN7Ve2kGLwhFn4cYBUB pKllH0/W//UZw== Date: Mon, 28 Feb 2022 14:17:52 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20220228141752.6a80abf6@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: Guchun Chen , Daniel Vetter , Linux Kernel Mailing List , Linux Next Mailing List , Alex Deucher , Leslie Shi , Tomohito Esaki Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_display.c between commit: e2b993302f40 ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)") from Linus' tree and commit: 2af104290da5 ("drm: introduce fb_modifiers_not_supported flag in mode_config") from the drm tree. I fixed it up (I think - 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/amd/amdgpu/amdgpu_display.c index c4387b38229c,9e5fc4cdb8ec..000000000000 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c