From patchwork Fri Jun 28 16:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13716434 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 A4C7EC2BD09 for ; Fri, 28 Jun 2024 16:51:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33E1A10ECBF; Fri, 28 Jun 2024 16:51:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="JpuuV/eY"; dkim-atps=neutral Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6B00F10ECBE for ; Fri, 28 Jun 2024 16:51:39 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C178BCE4212; Fri, 28 Jun 2024 16:51:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62D31C116B1; Fri, 28 Jun 2024 16:51:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719593496; bh=Xx8AHRpEaxvuZ24nCW01xv/wTFnUrbCQevtmg0yUDOE=; h=Date:From:To:Cc:Subject:From; b=JpuuV/eYiclGYNAVtvJDqTrDM7x5lvbnXrdH/8BFy+8SlQMDNob5sS/Wxijl/qKPO FEg0YmRorYkgAnBeiCIeFc6bfUA5YnQMgCWxVNZ+Pqj/uwGoHzKYURZSY7Fh+EYkuH o5B0hLxONKr5r5omMZgv/Pp3i4Tp2u73N7uqUtSL7QOybpCNh//RVQzK4m0gnFfpo0 vWSx1MVCfhnl4FW7o42JtzfalJcnrGBZFFWo+6i6ibpu1R3zZra/grUTePRlfCtkMf fht6WAR8o2GK2yd89Cx/1n0Bp0IZ6TQnPCGAkPRbTnZwQQIlpvz5joGHc6YZrYqNAs sCoDg8cgAqTxQ== Date: Fri, 28 Jun 2024 17:51:31 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Linux Kernel Mailing List , Linux Next Mailing List , Riana Tauro , Rodrigo Vivi , Thomas =?iso-8859-1?q?Hellstr=F6m?= Subject: linux-next: manual merge of the drm tree with the origin tree Message-ID: MIME-Version: 1.0 Content-Disposition: inline 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/xe/xe_gt_idle.c between commit: 2470b141bfae2 ("drm/xe: move disable_c6 call") from the origin tree and commits: 6800e63cf97ba ("drm/xe: move disable_c6 call") 38e8c4184ea0e ("drm/xe: Enable Coarse Power Gating") ecab82af27873 ("drm/xe/vf: Don't support gtidle if VF") 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. +++ b/drivers/gpu/drm/xe/xe_gt_idle.c diff --cc drivers/gpu/drm/xe/xe_gt_idle.c index 944770fb2daff,67aba41405100..0000000000000 --- a/drivers/gpu/drm/xe/xe_gt_idle.c