[Intel-gfx] linux-next: manual merge of the char-misc tree with the drm-intel tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c

between commit:

  5740211ea442 ("drm/i915/dmabuf: fix broken build")

from the drm-intel tree and commit:

  16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")

from the char-misc 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/gpu/drm/i915/gem/i915_gem_dmabuf.c
index a45d0ec2c5b6,abb854281347..000000000000
--- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@@ -12,13 -13,8 +13,15 @@@
  #include "i915_gem_object.h"
  #include "i915_scatterlist.h"
  
 +#if defined(CONFIG_X86)
 +#include <asm/smp.h>
 +#else
 +#define wbinvd_on_all_cpus() \
 +	pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__)
 +#endif
 +
+ MODULE_IMPORT_NS(DMA_BUF);
+ 
  I915_SELFTEST_DECLARE(static bool force_different_devices;)
  
  static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20211028/133a641e/attachment.sig>