* linux-next: manual merge of the drm-msm-lumag tree with the drm-misc tree
@ 2023-10-06 1:44 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-10-06 1:44 UTC (permalink / raw)
To: Dmitry Baryshkov, Daniel Vetter
Cc: Intel Graphics, DRI, Christian König, Kees Cook,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 896 bytes --]
Hi all,
Today's linux-next merge of the drm-msm-lumag tree got a conflict in:
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h
between commit:
8f5d3daad715 ("drm/msm/dpu: Annotate struct dpu_hw_intr with __counted_by")
from the drm-misc tree and commits:
eb7af0e86349 ("drm/msm/dpu: add helper to get IRQ-related data")
07e7d96dcb08 ("drm/msm/dpu: make the irq table size static")
from the drm-msm-lumag tree.
I fixed it up (the latter 2 replaced what was updated by 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:[~2023-10-06 1:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-06 1:44 linux-next: manual merge of the drm-msm-lumag tree with the drm-misc 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;
as well as URLs for NNTP newsgroup(s).