Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/ttm/ttm_pool.c
between commit:
23baf831a32c0 ("mm, treewide: redefine MAX_ORDER sanely")
from the mm-stable tree and commit:
56e51681246e5 ("drm/ttm: revert "Reduce the number of used allocation ord
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_snps_phy.c
between commit:
28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error")
from the drm-intel-fixes tree and commits:
84073e568eec7 ("drm/i915/dg2: P
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
between commit:
721fd84ea1fe9 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for
reference")
from the drm-intel-gt tree and commit:
b3f74938d6566 ("dr
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_bw.c
between commit:
ec663bca9128f ("drm/i915: Fix bw atomic check when switching between SAGV vs.
no SAGV")
from the drm-intel-fixes tree and commit:
6d8ebef53c2cc ("drm/i915:
Hi all,
Today's linux-next merge of the drm-intel-gt tree got conflicts in:
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
between commits:
b508d01fa577e ("drm/i915: split out i
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
From: Mark Brown
intel_device_info.h references struct pci_dev but does not ensure that
the struct has been declared, causing build failures if something in
other headers changes so that the implicit dependency it is relying on
is no longer satisfied:
In file included from
/tmp/next/build/drive
