linux-next: manual merge of the accel tree with the drm-fixes tree

linux-next: manual merge of the accel tree with the drm-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1451 bytes --]

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.

-- 
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
  
  #else
  
- static inline void __init hl_debugfs_init(void)
- {
- }
- 
- static inline void hl_debugfs_fini(void)
- {
- }
- 
 +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)
  {
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]