From patchwork Mon Sep 16 04:15:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13804999 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 A4C54C3ABCE for ; Mon, 16 Sep 2024 04:15:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9E7C10E013; Mon, 16 Sep 2024 04:15:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bMsTXyvy"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E03910E013 for ; Mon, 16 Sep 2024 04:15:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1726460121; bh=aSMGNOW8vImcRzjGRzIsVUvVAA6VLJ9IpG/L1pmcNJw=; h=Date:From:To:Cc:Subject:From; b=bMsTXyvyjD60NmFjP3DNMjJRGM2GSjWfWj9cAop6UPf1SExGyqBCSvbEeJ2oMYlpq LPg/SH5Bn9C08Qc8he9wXuvpGfuJRtELI4Z+tqw2mLIQEcEWy6A89HKJLiLSV3eiKY YPbnrWWDaqJHfLQSH/83RTVRAyIpKVvRH0EuTqZcHLDlPuaHvt0uPsxNvzmNhfaA4B y+BzViOp3e8AcjcAx9n0M8hs5MtCbV7dvGRvmFGoqbwnUpnoeeuvwJAbxSmkuExRWw eEPC3q0YfURp9q/MieKoB0XmXh5T8swsdB91ibbmwuyZJqy/8vYgLzarxrVWFNhbIP X8vyLAi9jIF3g== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4X6Wm65Bglz4x8F; Mon, 16 Sep 2024 14:15:18 +1000 (AEST) Date: Mon, 16 Sep 2024 14:15:17 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Alex Deucher , Jerry Zuo , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Mario Limonciello , Sung Joon Kim , Tobias Jakobi Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20240916141517.3ef8b349@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: , 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/dc/hwss/dcn35/dcn35_hwseq.c between commit: e835d5144f5e ("drm/amd/display: Avoid race between dcn35_set_drr() and dc_state_destruct()") from Linus' tree and commit: be7a6a517164 ("drm/amd/display: Check stream pointer is initialized before accessing") 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/dc/hwss/dcn35/dcn35_hwseq.c index d5e9aec52a05,a4c6decee0f8..000000000000 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c