linux-next: manual merge of the modules tree with the drm-xe tree

linux-next: manual merge of the modules tree with the drm-xe tree

[Mark Brown]

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

Hi all,

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

  drivers/gpu/drm/xe/xe_guc_log.c

between commit:

  149f81d8a73ea ("drm/xe/guc: Compress GuC log and CTB dump with zstd")

from the drm-xe tree and commit:

  291a8fe5d999c ("drm/xe: Include error-injection.h for ALLOW_ERROR_INJECTION()")

from the modules 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.

diff --cc drivers/gpu/drm/xe/xe_guc_log.c
index 90aeaccea596c,6f0739204d9e2..0000000000000
--- a/drivers/gpu/drm/xe/xe_guc_log.c
+++ b/drivers/gpu/drm/xe/xe_guc_log.c
@@@ -5,10 -5,7 +5,10 @@@
  
  #include "xe_guc_log.h"
  
- #include <linux/fault-inject.h>
+ #include <linux/error-injection.h>
 +#if IS_ENABLED(CONFIG_DRM_XE_COMPRESS_DUMP)
 +#include <linux/zstd.h>
 +#endif
  
  #include <linux/utsname.h>
  #include <drm/drm_managed.h>

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