From patchwork Wed Nov 16 00:09:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13044294 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 8E25DC433FE for ; Wed, 16 Nov 2022 00:09:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE73910E0F9; Wed, 16 Nov 2022 00:09:30 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 934B510E0F9; Wed, 16 Nov 2022 00:09:27 +0000 (UTC) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NBk1c5hkTz4xGH; Wed, 16 Nov 2022 11:09:24 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668557365; bh=6Nu4z6TdAZbmv8KRjIMPAWBQTNbHXtov0C66FP7Dsyw=; h=Date:From:To:Cc:Subject:From; b=sy0p4glJEpPzZDYl5SH1/6Kbi9cBB9sNJHISD+khwc9+U+vnu8uKbOp5pLviPLjA0 Fbgg3XBylRV5yRmJ3y1qE9UUPDigVuldmHq7QHZ/Qma9ld1/mhBJ7Uu937Ini4dhzp dHPno5qkkHPpir6KsRyfCPBaCQ65CzNAOpTEXGI667WgzVjlF5MUCi/diYvmqx1kZs yIDuAdgGXhSvZPb5Ip+Hh1pEppQPp8GDJ1WJJ8S5JmAjhwinUrd0dxwF4cilUyzLnW H+m6WLVHvH9yRE746Yeky2CbEWWWA6r9MD7hNdAua18V1X/HtC9Oz4vJLiwG8bwg23 wWoUN9+wEe13A== Date: Wed, 16 Nov 2022 11:09:23 +1100 From: Stephen Rothwell To: Alex Deucher , Daniel Vetter Message-ID: <20221116110923.0b6b04da@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the amdgpu tree with the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Alex Deucher , Christian =?utf-8?b?S8O2bmln?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the amdgpu tree got a conflict in: include/drm/gpu_scheduler.h between commit: 2cf9886e2816 ("drm/scheduler: remove drm_sched_dependency_optimized") from the drm-misc tree and commit: 06a2d7cc3f04 ("drm/amdgpu: revert "implement tdr advanced mode"") from the amdgpu 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 include/drm/gpu_scheduler.h index cec147f7c50b,0168ff469ae0..000000000000 --- a/include/drm/gpu_scheduler.h