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

Commit Message

Stephen Rothwell Sept. 20, 2023, 1:12 a.m. UTC

Hi all,

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

  drivers/gpu/drm/nouveau/nouveau_connector.c

between commit:

  1b254b791d7b ("drm/nouveau/disp: fix use-after-free in error handling of nouveau_connector_create")

from Linus' tree and commit:

  8b7d92cad953 ("drm/nouveau/kms/nv50-: create connectors based on nvkm info")

from the drm-misc tree.

I fixed it up (I think, 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/nouveau/nouveau_connector.c
index 79ea30aac31f,94498c15b50e..000000000000
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c