linux-kernel - linux-next: manual merge of the drm-nova tree with Linus' 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: <20250428123825.4acf2499@canb.auug.org.au>
Date: Mon, 28 Apr 2025 12:38:25 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Danilo Krummrich <dakr@...nel.org>
Cc: Asahi Lina <lina+kernel@...hilina.net>, FUJITA Tomonori
 <fujita.tomonori@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Miguel Ojeda <ojeda@...nel.org>
Subject: linux-next: manual merge of the drm-nova tree with Linus' tree

Hi all,

Today's linux-next merge of the drm-nova tree got a conflict in:

  rust/helpers/helpers.c

between commit:

  c1b4071ec3a6 ("rust: helpers: Add dma_alloc_attrs() and dma_free_attrs()")

from Linus' tree and commit:

  be8d1a24798f ("rust: drm: gem: Add GEM object abstraction")

from the drm-nova 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 rust/helpers/helpers.c
index 0aea103c16be,6c205454a18e..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -14,7 -15,7 +15,8 @@@
  #include "cpumask.c"
  #include "cred.c"
  #include "device.c"
 +#include "dma.c"
+ #include "drm.c"
  #include "err.c"
  #include "fs.c"
  #include "io.c"

Content of type "application/pgp-signature" skipped