Re: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree

From: Stephen Rothwell
Date: Mon Apr 25 2022 - 21:48:37 EST

Hi all,

On Thu, 14 Apr 2022 09:47:15 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the drm-misc tree got a conflict in:
> drivers/gpu/drm/radeon/radeon_sync.c
> between commit:
> 022074918042 ("drm/radeon: fix logic inversion in radeon_sync_resv")
> from the drm-misc-fixes tree and commit:
> 7bc80a5462c3 ("dma-buf: add enum dma_resv_usage v4")
> from the drm-misc tree.
> I fixed it up (I just used the latter version) 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.

This is now a conflict between the drm tree and Linus' tree.

Stephen Rothwell

Attachment: pgpYWHkCnUBRP.pgp
Description: OpenPGP digital signature