Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 21 Jul 2023 11:51:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Oded Gabbay <ogabbay@kernel.org>, Dave Airlie <airlied@redhat.com>
Cc:     DRI <dri-devel@lists.freedesktop.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Tomer Tayar <ttayar@habana.ai>
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
Content-Type: multipart/signed; boundary="Sig_/b0oUpqwa9ypfXxxU53K.z=.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/b0oUpqwa9ypfXxxU53K.z=.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 devi=
ce")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/accel/habanalabs/common/habanalabs.h
index 2f027d5a8206,834f8cbf080a..000000000000
--- a/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@@ -3972,23 -4002,6 +4002,15 @@@ void hl_debugfs_set_state_dump(struct h
 =20
  #else
 =20
- static inline void __init hl_debugfs_init(void)
- {
- }
-=20
- static inline void hl_debugfs_fini(void)
- {
- }
-=20
 +static inline int hl_debugfs_device_init(struct hl_device *hdev)
 +{
 +	return 0;
 +}
 +
 +static inline void hl_debugfs_device_fini(struct hl_device *hdev)
 +{
 +}
 +
  static inline void hl_debugfs_add_device(struct hl_device *hdev)
  {
  }

--Sig_/b0oUpqwa9ypfXxxU53K.z=.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmS55LYACgkQAVBC80lX
0Gzt8Qf9HjJt7tjvEztvAjv+OX1LSGlmesquKwuFDX+VuXNWIVnuma/tJdxBwVCz
P9ghW6JYvrQpjFQdnUT3JSE9dlVvqx19t/zD9L4yqJv5TAHBW3mbgr6rbEAxQMQP
HKriXAfbs/8ASRMY0YQPnNS3ie4es87LDjVUfu6r1RWugsExOGOp9i9/0e6QDgE3
ffeWUrZbLYFAZTWSry2nvEhZVdTZRzrJy79A7DPpnGQW+ox3vRXSlJbhEYEjc25R
OWuMr4S4lk7MSzInX5vGR5vuLzlDtjkjLRBLRpuL92bZkvqfHSjc6zcRJRjRhvjI
1xfC8VqSRZDxtM7aP2epL5IkzaiRZg==
=sO4I
-----END PGP SIGNATURE-----

--Sig_/b0oUpqwa9ypfXxxU53K.z=.--