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

2022-02-13 Thread Stephen Rothwell
Hi all, The ongoing merge conflicts between the drm-intel tree and the drm-intel-gt tree are just a mess, so I am removing the drm-intel-gt tree from linux-next until you all can come up with a better way of doing conflicting development. -- Cheers, Stephen Rothwell pgpUb8sYXu0kT.pgp Descripti

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

2022-02-02 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel-gt tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: 0d6419e9c855 ("drm/i915: Move GT registers to their own header file") from the drm-intel tree and commit: 270677026261 ("drm/i915/dg2: Add Wa_14015227452") from

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

2022-01-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel-gt tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: 2ef97818d3aa ("drm/i915: split out i915_gem_evict.h from i915_drv.h") from the drm-intel tree and commit: 7e00897be8bf ("drm/i915: Add object locking to i915_gem_

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

2021-12-01 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the drm-intel-gt tree got a conflict in: drivers/gpu/drm/i915/display/intel_fbc.c between commit: d06188234427 ("drm/i915/fbc: s/dev_priv/i915/") from the drm-intel tree and commit: cca084692394 ("drm/i915: Use per device iommu check") from the drm-i

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

2021-11-23 Thread Stephen Rothwell
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: 3c542cfa8266 ("drm/i915/dg2: Tile 4 plane format support") from the drm-intel tree and commit: a5b7ef27da60 ("drm/i915: Add struct to hold IP version") from the