From patchwork Mon Mar 4 01:08:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13579918 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 93378C5475B for ; Mon, 4 Mar 2024 01:08:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 42FB910F713; Mon, 4 Mar 2024 01:08:17 +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="TbA6wqbw"; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BCC410F713 for ; Mon, 4 Mar 2024 01:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709514492; bh=wCBQxlkia3rFEEfyeOb8tCdt6hGJM2RzeP67NHnaLkk=; h=Date:From:To:Cc:Subject:From; b=TbA6wqbwyeQoD6PjxkVhCwoCfBHRD91oPd6a5b2KmRmoydJNntW1fF0UMK/zwHi0z 7o8l3mfqqAZDNoEHOn4UGF9WXxRUx4EcKw8sVxly3NREJBh988q3Ijha0KBN3vQOcf XpUEUKEzXjURtt3nPh81DHS8z+ZEy2RaqYr0WbOBZA5nIFbUHv7NdPhD1pWrb0VWEI scUSC+CZYGEc5haWNub1bII/3I5w1Bk6Jsa61y6hh38i3JDRbVjW5uvTsblJuKA7VW VKYEILZyI7ZSc4SN8QcjpUtDjy01UY/dRkGyZmXH2XOo9RxCEF0+7ZpNWfqUwcBcg5 g/c4lM/In2d4Q== 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 4Tp0tg3F0Bz4wcJ; Mon, 4 Mar 2024 12:08:11 +1100 (AEDT) Date: Mon, 4 Mar 2024 12:08:10 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Brian Welty , Francois Dugast , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Brost , Rodrigo Vivi , Thomas =?utf-8?q?Hellstr=C3=B6m?= Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20240304120810.68681bd8@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, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the drm tree got conflicts in: drivers/gpu/drm/xe/xe_exec_queue.c drivers/gpu/drm/xe/xe_exec_queue_types.h between commit: eaa367a0317e ("drm/xe/uapi: Remove unused flags") from Linus' tree and commits: 25ce7c5063b3 ("drm/xe: Finish refactoring of exec_queue_create") f1a9abc0cf31 ("drm/xe/uapi: Remove support for persistent exec_queues") 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_exec_queue.c index 49223026c89f,4bb8f897bf15..000000000000 --- a/drivers/gpu/drm/xe/xe_exec_queue.c diff --cc drivers/gpu/drm/xe/xe_exec_queue_types.h index 36f4901d8d7e,c40240e88068..000000000000 --- a/drivers/gpu/drm/xe/xe_exec_queue_types.h