From patchwork Tue Jan 14 01:30:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13938281 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 E0A2CC02180 for ; Tue, 14 Jan 2025 01:30:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DD8A10E14E; Tue, 14 Jan 2025 01:30:37 +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="Or1VNnSW"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 471DD10E14E; Tue, 14 Jan 2025 01:30:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1736818223; bh=uq4TdeSTT+OI1UyCzrbwriLkWC75e1mMtOZYuBwrIKA=; h=Date:From:To:Cc:Subject:From; b=Or1VNnSWjVecmiH7X0VYBn5IiBAw4na56uh2EN+m2O4Lirah7/H9MG+OUvBoyN51f A1/cMIcDBiQLM6Y2jW2ltt+HYuffVYSrPn1HCck6b0P8NjVNUYJJ/lmFv5wHSUTMGS gEFXmVUxmWAN/MmlwukaYyl3niGV16odhCQkScmTCXiFL2w3vJ0ywWtIgQPghbYr4L SBvFbDYyNZhecRtzCywGX/+cdX/D74tz8o2ixloyJbh4BzH+9Co7EqUnkiDo29viPb EyLZlvywLmpUZ6Qn6cj66v6XzzVgH0BKVxAtR3oefWFRhOHnu7Q6311kqQ9HI5Uzbl tU8SzxLMvWH9w== 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 4YXBQQ6t17z4wp0; Tue, 14 Jan 2025 12:30:22 +1100 (AEDT) Date: Tue, 14 Jan 2025 12:30:28 +1100 From: Stephen Rothwell To: Dave Airlie , Simona Vetter Cc: Cristian Ciocaltea , Dmitry Baryshkov , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20250114123028.67761865@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/display/drm_bridge_connector.c between commit: 1bd1562d3522 ("drm/bridge-connector: Sync supported_formats with computed ycbcr_420_allowed") from the drm-misc-fixes tree and commit: 0beba3f9d366 ("drm/bridge: connector: add support for HDMI codec framework") 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/display/drm_bridge_connector.c index 3a5a4f92c979,32108307de66..000000000000 --- a/drivers/gpu/drm/display/drm_bridge_connector.c