* linux-next: manual merge of the drm-misc tree with the pmdomain tree
@ 2024-08-29 1:00 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-08-29 1:00 UTC (permalink / raw)
To: Daniel Vetter, Ulf Hansson
Cc: Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/tegra/gr3d.c
between commit:
606cb5b75827 ("drm/tegra: gr3d: Convert into devm_pm_domain_attach_list()")
from the pmdomain tree and commit:
f790b5c09665 ("drm/tegra: gr3d: Convert into dev_pm_domain_attach|detach_list()")
from the drm-misc tree.
I fixed it up (I just used the former) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-08-29 1:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 1:00 linux-next: manual merge of the drm-misc tree with the pmdomain tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox