From patchwork Mon Apr 29 03:12:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13646211 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 3EC0FC19F4F for ; Mon, 29 Apr 2024 03:12:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DDAC10EE69; Mon, 29 Apr 2024 03:12:55 +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="OFvPKKzx"; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A02310E099; Mon, 29 Apr 2024 03:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1714360368; bh=2FzFPUX3bLG3faCR0xhttaBk0b99Aw0RFjXJ8hQd4cE=; h=Date:From:To:Cc:Subject:From; b=OFvPKKzx+stCGjTBRA6T6BVN2JBAFtMIHeJ2LrLdz24W3pcCvyT+NhtlM2+fp2ovp R/n8rCWQjTO+AZMIo+xgVyvs6YoH4/SEc/sIV2jQwvEQt30XEMvxfJahRUHAGKw2GM tOXnaR2DVaeQuayNfDIfGnK14X0KbsMZxDCkdoKEhQhlCHJiQ6jpTWndc2E8GrhWp+ D0YFgPlc6T2EFgYopHh4mUiKTYCpwl3T7Er+1417aD/aPUJaU3rWgSQavcXBVz96zJ nfpCl8V+vSpA2ohTfNfmEdoADJ8ePER4zeqeXrAUJ86Gq+ru/zMn33buuCyT4TXGwW lUuvDcyrVpkEg== 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 4VST0b4VLWz4wyp; Mon, 29 Apr 2024 13:12:47 +1000 (AEST) Date: Mon, 29 Apr 2024 13:12:45 +1000 From: Stephen Rothwell To: Lucas De Marchi , Oded Gabbay , Thomas =?utf-8?q?Hellstr=C3=B6m?= , Dave Airlie Cc: DRI , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-xe tree with the drm tree Message-ID: <20240429131245.5d4fcc37@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-xe tree got a conflict in: drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h between commit: cb4046d289bd ("drm/i915: Drop dead code for xehpsdv") from the drm tree and commit: 6a2a90cba12b ("drm/xe/display: Fix ADL-N detection") from the drm-xe 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/xe/compat-i915-headers/i915_drv.h index ffaa4d2f1eed,9ee694bf331f..000000000000 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h