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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  drivers/gpu/drm/xe/xe_wa_oob.rules

between commit:

  cc319238e3f66 ("drm/xe: Add wa_14025941587 to xe2, xe3 and xe3p platforms")

from the origin tree and commits:

  d1b210c045f70 ("drm/xe/xe3p_lpg: Add support for Wa_16030224309")
  9453c528fc909 ("drm/xe: Add wa_14025941587 to xe2, xe3 and xe3p platforms")

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_wa_oob.rules
index 3001155f8d09e,f35181fc4e49b..0000000000000
--- a/drivers/gpu/drm/xe/xe_wa_oob.rules
+++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
@@@ -14,6 -14,7 +14,7 @@@
  16017236439	PLATFORM(PVC)
  14019821291	MEDIA_VERSION_RANGE(1300, 2000)
  14015076503	MEDIA_VERSION(1300)
+ 22016122933	MEDIA_VERSION(1300)
  14018913170	GRAPHICS_VERSION_RANGE(1270, 1274)
  		MEDIA_VERSION(1300)
  		PLATFORM(DG2)
@@@ -74,3 -75,4 +75,4 @@@
  14027054324	GRAPHICS_VERSION(3511)
  14025941587	GRAPHICS_VERSION_RANGE(2001, 3511), FUNC(xe_rtp_match_not_sriov_vf)
  		MEDIA_VERSION_RANGE(1301, 3503), FUNC(xe_rtp_match_not_sriov_vf)
+ 16030224309	GRAPHICS_VERSION(3510)

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