From patchwork Mon May 6 02:17:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13654827 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 7AE2BC4345F for ; Mon, 6 May 2024 02:18:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C44210E615; Mon, 6 May 2024 02:18:08 +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="kywDGneH"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE99410E615; Mon, 6 May 2024 02:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1714961881; bh=soFSD916NRLT6/m2clSFEXil9meuREHqNYpgRHAYDh4=; h=Date:From:To:Cc:Subject:From; b=kywDGneH6DxElX/YlYI2lslELIDY3H1jOiGgsRvvLkFfKNGGgy6fVDZA7paVXffDQ 68pSP7Onlq64BJ57ZjgKKWbIjeC+xvFjsJBFYHf6g7USYssLvMBtDpDDKbplkoJ7Bv hHwwpEqE8Sux3K3PGelvJjrIs0K5+BH7nBzUu4SgDinGEgqFNP4kCjorFiThqs9Nrd E+MIXDnMiGnnnhBAkyLIMfynX/kDW6+xnhhgpsGnLf4FiRxMMlCPc0+n0Uufg1QRJh DnFy1yaH7x2/Htg1847HpB5kU/dlQCFF+Bak7toYjAqpPrQpYlsY2F5hM6SKaKKniH s9VZ3LRYmtxzg== 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 4VXlS77221z4x0x; Mon, 6 May 2024 12:17:59 +1000 (AEST) Date: Mon, 6 May 2024 12:17:59 +1000 From: Stephen Rothwell To: Lucas De Marchi , Oded Gabbay , Thomas =?utf-8?q?Hellstr=C3=B6m?= , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , DRM XE List , Balasubramani Vivekanandan , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Auld , Nirmoy Das , Radhakrishna Sripada Subject: linux-next: manual merge of the drm-xe tree with the drm-intel tree Message-ID: <20240506121759.5b6c6a7c@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/xe_device.h between commit: c01c6066e6fa ("drm/xe/device: implement transient flush") from the drm-intel tree and commits: fb74b205cdd2 ("drm/xe: Introduce a simple wedged state") 8ed9aaae39f3 ("drm/xe: Force wedged state and block GT reset upon any GPU hang") 6b8ef44cc0a9 ("drm/xe: Introduce the wedged_mode debugfs") 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/xe_device.h index 7524a71c0d84,82317580f4bf..000000000000 --- a/drivers/gpu/drm/xe/xe_device.h