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

Commit Message

Stephen Rothwell July 21, 2023, 1:51 a.m. UTC

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.

Patch

diff --cc drivers/accel/habanalabs/common/habanalabs.h
index 2f027d5a8206,834f8cbf080a..000000000000
--- a/drivers/accel/habanalabs/common/habanalabs.h