From patchwork Mon Mar 23 00:50:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11452183 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 79D1C92A for ; Mon, 23 Mar 2020 00:50:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 57545206C3 for ; Mon, 23 Mar 2020 00:50:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="s+b/7F1h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57545206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D6DD6E109; Mon, 23 Mar 2020 00:50:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 300466E109 for ; Mon, 23 Mar 2020 00:50:17 +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 48lwlQ5dCrz9sQt; Mon, 23 Mar 2020 11:50:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1584924615; bh=h33vmQmR6+cqLLlsiq13QBebcQ0ZhM+IXVkPxrbI3sw=; h=Date:From:To:Cc:Subject:From; b=s+b/7F1hz2XX8IFv8SVcPNBWwsFksv6UfxV56FmhQnQkVj7/QLTqE2XLu3m3T4UyF iuOc7qBBrn3G9BT8Je+YXOTsUYEH+cZz7CLfMpncKCnBJzziGE1jUxT5N2EGCz+1BX CKXAxxjYoQPcN53TpZDk1gQvtjDJXde3z1xkQRZFg9i/X5hEMYBAelGQ6pl1963ByP KGUGF0tWKadyaoYXv4duycxdM05sfkLKxCUJ4P6f/KAXX+BMuYFgQB0/f1AgqMyDqQ FteN/OqHiN7OSDNlhTVzsyOry408ZMw0OlJ/6eLhWqAJY39itYuzbZCSjWar3fMajl N6z2diZM0cPmQ== Date: Mon, 23 Mar 2020 11:50:08 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20200323115008.7ff7dcbf@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: Alex Deucher , Linux Next Mailing List , Linux Kernel Mailing List 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/display/amdgpu_dm/amdgpu_dm.c between commit: eb916a5a93a6 ("drm/amd/display: Fix pageflip event race condition for DCN.") from Linus' tree and commit: 7f2be468a855 ("drm/amdgpu: Stop using the DRIVER debugging flag for vblank debugging messages") from the drm 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/amd/display/amdgpu_dm/amdgpu_dm.c index 6240259b3a93,a4256780e70e..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c