linux-next: manual merge of the drm-intel-gt tree with the drm-intel tree

[broonie]

Hi all,

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

  drivers/gpu/drm/i915/i915_pci.c

between commit:

  6678916dfa012 ("drm/i915: Move pipe/transcoder/abox masks under intel_device_info.display")

from the drm-intel tree and commit:

  c83125bb2199b ("drm/i915: Add has_64k_pages flag")

from the drm-intel-gt 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/i915/i915_pci.c
index ae36dfd77dcfa,332cb8b25e494..0000000000000
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@@ -1027,6 -1015,8 +1027,7 @@@ static const struct intel_device_info x
  	DGFX_FEATURES,
  	PLATFORM(INTEL_XEHPSDV),
  	.display = { },
+ 	.has_64k_pages = 1,
 -	.pipe_mask = 0,
  	.platform_engine_mask =
  		BIT(RCS0) | BIT(BCS0) |
  		BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |