From patchwork Mon Mar 24 03:06:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 14026763 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 18AAFC28B30 for ; Mon, 24 Mar 2025 03:06:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80D9310E1D0; Mon, 24 Mar 2025 03:06:25 +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="hM6PkbTU"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80F1A10E1D0 for ; Mon, 24 Mar 2025 03:06:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1742785567; bh=PDcit8P670kcmY2ktuwUGkkvaDYFCfnPTpn5lWSchjQ=; h=Date:From:To:Cc:Subject:From; b=hM6PkbTUO9UQVE5Ii9MmQgHfOe/UqN1aoJCBq32qVpe5nHjnUBWbVP9C+hIeqTPFz dkHYcIxpDnH1Jb86JesSjRoPKaZ/H7InudTD0Y4Wm6OmkFfCjsAVhjB6514o5V7PFr zvVQQKE+OxjK5l6b5vvG732vACnM40tVQVNSH7l/5Ry6TmtJtg9OovsEbM6slTpUgq +tojH5XHGcqvo7rF5K6VfqUo1oJij4Ol27YVRdkXmRhz5KE1mr7fpeRgoIK2nMGIZj 53V2YGFyBjbAhY8N1YiShl9e8w7z8018ojLHHfH81FWRy7vNkBhBBHMBdf7AQwMCsa FG65ALZNZpnbQ== 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 4ZLdH24pSHz4wc4; Mon, 24 Mar 2025 14:06:06 +1100 (AEDT) Date: Mon, 24 Mar 2025 14:06:06 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Jacek Lawrynowicz , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?utf-8?q?Hell?= =?utf-8?q?str=C3=B6m?= , Tomasz Rusinowicz Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20250324140606.7b87b0a2@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/xe/xe_bo.h between commit: 50af7cab7520 ("drm/xe: Fix exporting xe buffers multiple times") from Linus' tree and commit: 00c8efc3180f ("drm/xe: Add a shrinker for xe bos") 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/xe/xe_bo.h index 43bf6f140d40,bda3fdd408da..000000000000 --- a/drivers/gpu/drm/xe/xe_bo.h