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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230721115150.39142d89@canb.auug.org.au>
Date:   Fri, 21 Jul 2023 11:51:50 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Oded Gabbay <ogabbay@...nel.org>, Dave Airlie <airlied@...hat.com>
Cc:     DRI <dri-devel@...ts.freedesktop.org>,
        Arnd Bergmann <arnd@...db.de>,
        Daniel Vetter <daniel.vetter@...ll.ch>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Tomer Tayar <ttayar@...ana.ai>
Subject: linux-next: manual merge of the accel tree with the drm-fixes tree

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)
  {
  }

Content of type "application/pgp-signature" skipped