diff mbox series

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

Message ID 20240304120810.68681bd8@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the drm tree with Linus' tree | expand

Commit Message

Stephen Rothwell March 4, 2024, 1:08 a.m. UTC
Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the drm tree got conflicts in:

  drivers/gpu/drm/xe/xe_exec_queue.c
  drivers/gpu/drm/xe/xe_exec_queue_types.h

between commit:

  eaa367a0317e ("drm/xe/uapi: Remove unused flags")

from Linus' tree and commits:

  25ce7c5063b3 ("drm/xe: Finish refactoring of exec_queue_create")
  f1a9abc0cf31 ("drm/xe/uapi: Remove support for persistent exec_queues")

from the drm 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 mbox series

Patch

diff --cc drivers/gpu/drm/xe/xe_exec_queue.c
index 49223026c89f,4bb8f897bf15..000000000000
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
diff --cc drivers/gpu/drm/xe/xe_exec_queue_types.h
index 36f4901d8d7e,c40240e88068..000000000000
--- a/drivers/gpu/drm/xe/xe_exec_queue_types.h