From patchwork Fri Jul 21 01:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13321234 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 C6992EB64DA for ; Fri, 21 Jul 2023 02:11:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 67ABD10E165; Fri, 21 Jul 2023 02:11:18 +0000 (UTC) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E9F210E165 for ; Fri, 21 Jul 2023 02:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1689905468; bh=+F9Do2iPt8eaNfQKYFsnAMNyDwy1yHR6Xpybwtn95uI=; h=Date:From:To:Cc:Subject:From; b=e+KEDlEBUOjoXbz3y46/lQGEc8g3q3c9Z7yg2vKWxWmzXc0qimJT5g73yhm1o/ZPr 85KZ+/b9JmHrBPJj/VCji8iWkboBGS7KNHSNoUqwPDpzvBIw7gWHAY2jb0ZK5yH3Sj xO6iasddA3kQ29qG8RMkmbG6Fa8q673NPizT5f/VQnc121cf/YjFAtxnhKUKIzv+N9 O/Uu1S331lSNmOKTgrAGAnkvWkHDBvi0ZIJY8la+M+M6SgVMc5uoVtWKTFO9rLnKnl mzb2PZl949batyA4fSHY67RczhccCj14NYXOAvAyUNLPiAN9t0ob7FP1dpzQQ11Su3 0FWQ/yeNm2uYA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4R6Y20612Mz4wxn; Fri, 21 Jul 2023 12:11:04 +1000 (AEST) Date: Fri, 21 Jul 2023 11:51:50 +1000 From: Stephen Rothwell To: Oded Gabbay , Dave Airlie Subject: linux-next: manual merge of the accel tree with the drm-fixes tree Message-ID: <20230721115150.39142d89@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: , Cc: Arnd Bergmann , Daniel Vetter , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Tomer Tayar Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the accel tree got a conflict in: drivers/accel/habanalabs/common/habanalabs.h between commit: 78e9b217d78e ("accel/habanalabs: add more debugfs stub helpers") from the drm-fixes tree and commit: 32055d39a2bb ("accel/habanalabs: register compute device as an accel device") from the accel 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/accel/habanalabs/common/habanalabs.h index 2f027d5a8206,834f8cbf080a..000000000000 --- a/drivers/accel/habanalabs/common/habanalabs.h