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

Commit Message

Stephen Rothwell March 24, 2025, 3:06 a.m. UTC

Hi all,

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

  drivers/gpu/drm/xe/xe_bo.h

between commit:

  50af7cab7520 ("drm/xe: Fix exporting xe buffers multiple times")

from Linus' tree and commit:

  00c8efc3180f ("drm/xe: Add a shrinker for xe bos")

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.

Patch

diff --cc drivers/gpu/drm/xe/xe_bo.h
index 43bf6f140d40,bda3fdd408da..000000000000
--- a/drivers/gpu/drm/xe/xe_bo.h