From patchwork Mon Nov 20 01:28:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 166917 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1922535vqn; Sun, 19 Nov 2023 17:28:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvuQFqULBZEtkJK6o4PWqwr0lqzJSCMrK4bi/5F6jPoy+hUh/zoPKJ3B3ylcW5JbH75lw0 X-Received: by 2002:aa7:9310:0:b0:6c3:3213:2d17 with SMTP id cz16-20020aa79310000000b006c332132d17mr4191896pfb.29.1700443718349; Sun, 19 Nov 2023 17:28:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700443718; cv=none; d=google.com; s=arc-20160816; b=QZ4h4oaUsLkHVGDA4Z8hZljd0MOSlqsG9JUg9/YHnDZw+fFXeHeCm3zlQQp4FUkDbm Aj6nbeddgVWAixpjR+8AkycRLUGryT8dAtpQDO+utUPfuuvi+wpp6v4uZUseh4M+heVQ BrTjCU3nFuMZpo3B/DmnTkL+j7SEkuLxc3J06AR5L1dEaMTgkRqZtNxNrpNnzQL1Vgh1 gz+fVcjiR1/nzY3S0hXg+PzLpmIjNujsoRI/RCM4r+pH3eRAQ4ij3z6femS4nKN8JzI+ pEvNwhww7wir3eqnRId196ByoX9895x9VU7clrXSzpHUbmx7wfIQXjOvb6csidVamvgt JB6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=Csn+rSOlc7hq+c8kVNN3ZRY0a5UgOwfACyTDU+giBM4=; fh=Dx4bMbiKQjVNqm3P9zl2BZLKvSL/osY8myOCFTmrnfE=; b=DbegzTv3KYyoxbbdZiiJyOL3fpG2QUZdzCq/WZqmwUy0dhHGmepINp39wEzkdyIUhD yrPXRAIUwG8HOf4L8gZJ7kMfrWz6AHJWBcrESCwac++u38BV7QBV/xNvy+tSBIp4be/P aoafFOhsVuRIyg1TogAGbV+A9XXUsBT9mVtb/ht5S6uBQj4fPe3HSlR2MN2XZThkrl9r 9Y69l1+OX7Glb89V18lf2TvpSLL4y+UhbfsfjK1gQRzYVn37/44RGsY58TdWLG3sNCX+ B7iO2Wyg0nD7Is4mQlzF/U0pet4kxulhqI12GmBie+ncZEQ92xF87cV0AHL8VLG4h5rN Dd8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GQ5eWlmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id b16-20020a63cf50000000b005b7160263f2si7135479pgj.154.2023.11.19.17.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Nov 2023 17:28:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GQ5eWlmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4B6298087241; Sun, 19 Nov 2023 17:28:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231633AbjKTB20 (ORCPT + 28 others); Sun, 19 Nov 2023 20:28:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjKTB2Z (ORCPT ); Sun, 19 Nov 2023 20:28:25 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8136BA; Sun, 19 Nov 2023 17:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700443700; bh=Csn+rSOlc7hq+c8kVNN3ZRY0a5UgOwfACyTDU+giBM4=; h=Date:From:To:Cc:Subject:From; b=GQ5eWlmyF0MfSbdDe8/EDFZ9l/yhyRu23K+EbRZwDdGeXGB6sFWkA4WzWNDq01KsE 2OBK9ejg8LiiGnbgxHaOP0oE0qC8se1jctVja3ONLZu8Zi9zhAoVwdwuHOl/+hY3jl e2cJizyF+sOt6oAdJcis+xfag/TJ2pZj155AuphfD0Of0b2aAuRjQ6Sm9TIKGioFna WodTWKADnR54thH/0gpRqk650dUcLz5qcng1ucfMQqy/Tkv0EoZxu2FaiXcV7Ap9h+ 24AJYfDFw/x2c33gm/pikCUHA9qgwzeJ8uiLGOe/p4J459GYV/lxq61Z/ahHBHreh6 Pl2zBHZtz4qWw== 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) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SYVJM2FcNz4wnv; Mon, 20 Nov 2023 12:28:18 +1100 (AEDT) Date: Mon, 20 Nov 2023 12:28:18 +1100 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Alex Deucher Cc: Intel Graphics , DRI , Alex Deucher , Fangzhi Zuo , Imre Deak , Linux Kernel Mailing List , Linux Next Mailing List , Ville =?utf-8?b?U3ly?= =?utf-8?b?asOkbMOk?= Subject: linux-next: manual merge of the drm-intel tree with the amdgpu tree Message-ID: <20231120122818.09bb6f35@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 19 Nov 2023 17:28:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783044472330778859 X-GMAIL-MSGID: 1783044472330778859 Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c between commits: a58555359a9f ("drm/amd/display: Fix DSC not Enabled on Direct MST Sink") c29085d29562 ("drm/amd/display: Enable DSC Flag in MST Mode Validation") from the amdgpu tree and commit: 7707dd602259 ("drm/dp_mst: Fix fractional DSC bpp handling") from the drm-intel 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_mst_types.c index 8d7d4024f285,2afd1bc74978..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c