From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Intel Graphics" <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Christian König" <christian.koenig@amd.com>,
"Kees Cook" <keescook@chromium.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the drm-msm-lumag tree with the drm-misc tree
Date: Fri, 6 Oct 2023 12:44:47 +1100 [thread overview]
Message-ID: <20231006124447.10031f6e@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2023-10-06 1:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231006124447.10031f6e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®