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

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_tuning.c

between commit:

  e23fafb8594ea ("drm/xe/rtp: Add struct types for RTP tables")

from the drm-fixes tree and commits:

  5ff004fdc7377 ("drm/xe/rtp: Add struct types for RTP tables")
  e9845449e37f5 ("drm/xe/rtp: Ensure gt_was doesn't evaluate rules with engine types")

from the drm-xe 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 --combined drivers/gpu/drm/xe/xe_tuning.c
index bf3fad9cdbef4,bcec40ca2d35f..0000000000000
--- a/drivers/gpu/drm/xe/xe_tuning.c
+++ b/drivers/gpu/drm/xe/xe_tuning.c
@@@ -20,7 -20,7 +20,7 @@@
  #undef XE_REG_MCR
  #define XE_REG_MCR(...)     XE_REG(__VA_ARGS__, .mcr = 1)
  
- static const struct xe_rtp_table_sr gt_tunings = XE_RTP_TABLE_SR(
+ VISIBLE_IF_KUNIT const struct xe_rtp_table_sr gt_tunings = XE_RTP_TABLE_SR(
  	{ XE_RTP_NAME("Tuning: Blend Fill Caching Optimization Disable"),
  	  XE_RTP_RULES(PLATFORM(DG2)),
  	  XE_RTP_ACTIONS(SET(XEHP_L3SCQREG7, BLEND_FILL_CACHING_OPT_DIS))
@@@ -101,6 -101,7 +101,7 @@@
  				   BANK_HASH_4KB_MODE))
  	},
  );
+ EXPORT_SYMBOL_IF_KUNIT(gt_tunings);
  
  static const struct xe_rtp_table_sr engine_tunings = XE_RTP_TABLE_SR(
  	{ XE_RTP_NAME("Tuning: L3 Hashing Mask"),

Attachment: signature.asc
Description: PGP signature