[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

broonie at kernel.org broonie at kernel.org
Wed Feb 23 14:46:49 UTC 2022

Hi all,

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


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: Extract intel_bw_check_data_rate()")

from the drm-intel 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.

(took the drm-intel version)

More information about the Intel-gfx mailing list