linux-next: manual merge of the drm-nova tree with Linus' tree

linux-next: manual merge of the drm-nova tree with Linus' tree

[Stephen Rothwell]

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

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"

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