From patchwork Fri Oct 18 01:56:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13840974 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 AFCA5D3C53F for ; Fri, 18 Oct 2024 01:56:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FA4D10E231; Fri, 18 Oct 2024 01:56:58 +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="sHaariLp"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE49D10E231 for ; Fri, 18 Oct 2024 01:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1729216610; bh=fv5TdDOtmjmY3nCw0vNFC8sXNVF3YhtQ6Nu/cO8upnc=; h=Date:From:To:Cc:Subject:From; b=sHaariLpZATKLtYKBTpSdCLHBYCSkF79Knk87lw2aaaHHJTYvDxtpLgwYlCE30MOs 2EVMyuO64mr1ZGBtTfJMrkukE1MLnjyjq7BOPjiQqX6wCUt9Ne+2zoUqfGeaCbOBBn w7WdKlB1SLC5WFgSJtoyaNstDCoP6KZZauT9CKLYKRha5NZyBbYjqc6OdJNBTGIXsk J5jQgesy6JhlCszoS4mbdhouJvmJ/jNfQudISkJRwfCuur98WS8nZEBTwZKKxfjVmE 6jhwK6tIAPB5ImqGyEB0w9a2NqjKA4mTnCVHR66ckMlt2ji58qaIlBBlehqeDIkepb k8SNZiNNaRmUw== 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 4XV79X65rGz4wbr; Fri, 18 Oct 2024 12:56:48 +1100 (AEDT) Date: Fri, 18 Oct 2024 12:56:49 +1100 From: Stephen Rothwell To: Dave Airlie Cc: Ankit Nautiyal , Imre Deak , Joonas Lahtinen , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Message-ID: <20241018125649.4475512d@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/i915/display/intel_dp_mst.c between commit: 69b3d8721267 ("drm/i915/dp_mst: Handle error during DSC BW overhead/slice calculation") from the drm-fixes tree and commit: f2e2092a979c ("drm/i915/display: Use joined pipes in dsc helpers for slices, bpp") 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/i915/display/intel_dp_mst.c index eeaedd979354,4765bda154c1..000000000000 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c