From nobody Sun Sep 14 16:25:05 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF6D0C004D4 for ; Fri, 20 Jan 2023 00:33:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229448AbjATAdi (ORCPT ); Thu, 19 Jan 2023 19:33:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjATAd3 (ORCPT ); Thu, 19 Jan 2023 19:33:29 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9188BA5003; Thu, 19 Jan 2023 16:33:03 -0800 (PST) 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 4NygSb66w1z4xGM; Fri, 20 Jan 2023 11:32:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1674174769; bh=iozW0jdRdMl3BAmRM1JsaFrEz8h8JaFEk5HzgDL0ZGw=; h=Date:From:To:Cc:Subject:From; b=tEQK60aFpxxXeqmUdoO6X/YeFIU+epTWoi6S4ldcIob6W/gf8cgVvQlhd6f6YTjLM 44nZEwPZXrcMagiBSbNHtT3P3UXh2o7BSD2VzubO1tPdqhK5U9QwbFiIwUejX19mTT ykA+P2pk+VrA6MxwMirb2ru4E3APNO4BsQTFRFwPYtUg9UQ5czHO8T4ZuOVKlU0Z1T lzziv0tOjttzIxm2ZdgEaDhPpcWcNwQakxtDYsExcCVLUbVExfkdkMznuXhTDJFwdZ jWZcYR0J45V+jPMvikRIe3PRXJDmQFMDc3jpYxOu7fk5RCf7Cs1BE4qXKiQG0rYRPb 3NBnBEHeOorFg== Date: Fri, 20 Jan 2023 11:32:46 +1100 From: Stephen Rothwell To: Oded Gabbay , Daniel Vetter Cc: Intel Graphics , DRI , Jacek Lawrynowicz , Krystian Pradzynski , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the accel tree with the drm-misc tree Message-ID: <20230120113246.1a0a03fe@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/18Al4johj.5KC9aGdnvp1uq"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/18Al4johj.5KC9aGdnvp1uq Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the accel tree got conflicts in: drivers/Makefile drivers/accel/Kconfig drivers/accel/Makefile between commit: 35b137630f08 ("accel/ivpu: Introduce a new DRM driver for Intel VPU") from the drm-misc tree and commit: 45886b6fa0f1 ("habanalabs: move driver to accel subsystem") from the accel tree. I fixed it up (I used the latter version of Makefile and 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/accel/Kconfig index 4989376e5938,a5989b55178a..000000000000 --- a/drivers/accel/Kconfig +++ b/drivers/accel/Kconfig @@@ -23,4 -23,4 +23,5 @@@ menuconfig DRM_ACCE different device files, called accel/accel* (in /dev, sysfs and debugfs). =20 + source "drivers/accel/habanalabs/Kconfig" +source "drivers/accel/ivpu/Kconfig" diff --cc drivers/accel/Makefile index b1036dbc0ba4,4df38885d6c6..000000000000 --- a/drivers/accel/Makefile +++ b/drivers/accel/Makefile @@@ -1,3 -1,3 +1,4 @@@ # SPDX-License-Identifier: GPL-2.0-only =20 -obj-y +=3D habanalabs/ ++obj-y +=3D habanalabs/ +obj-y +=3D ivpu/ =20 --Sig_/18Al4johj.5KC9aGdnvp1uq Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPJ4S4ACgkQAVBC80lX 0GxYSwgAgZni86ut0MB88HqGN9ejslVuEULW13EVl3Zn/QzUdQkF/ZoKhc5tU6ul NuQe+KhlZ+YCd5VQ7aviQeuA+OV2JpNzDwlvFAKJ3XQuAzrCGe+9WW/v5TG3SzU3 hwdy2ax23/kSYhQeQt5aD6HwNP+faFLCpxOZ9Qu84A4SF/EhyEKZT3khVtNb49P+ Ipn5J9ucWv8TI9TqO0LLwrDmLTfrMPVUjXFmjV7HkYKAd2p28tmMCERyaLzuonlh c0Bd9TmRjouXiD+a4a0lNQRJbo5FlHtPIOA54o1TXfI6KYzNgaLK7U3fINXxa4k/ lAzGAsco/Xn2cG+AsW7tFZncUDjJnA== =qWkq -----END PGP SIGNATURE----- --Sig_/18Al4johj.5KC9aGdnvp1uq--