linux-next: manual merge of the drm-misc tree with Linus' tree

Commit Message

Stephen Rothwell Nov. 3, 2022, 11:15 p.m. UTC

Hi all,

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

  include/drm/gpu_scheduler.h

between commit:

  7b476affcccf ("drm/sched: add DRM_SCHED_FENCE_DONT_PIPELINE flag")

from Linus' tree and commit:

  4d5230b50dd4 ("drm/scheduler: add drm_sched_job_add_resv_dependencies")

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

Patch

diff --cc include/drm/gpu_scheduler.h
index ca11716d084a,e40baefadc3a..000000000000
--- a/include/drm/gpu_scheduler.h