From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Simona Vetter <simona.vetter@ffwll•ch>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Dmitry Baryshkov <dmitry.baryshkov@linaro•org>,
Dmitry Baryshkov <dmitry.baryshkov@oss•qualcomm.com>,
Gabriel Dalimonte <gabriel.dalimonte@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Maxime Ripard <mripard@kernel•org>
Subject: linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree
Date: Wed, 11 Jun 2025 12:08:01 +1000 [thread overview]
Message-ID: <20250611120801.48566070@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
c0317ad44f45 ("drm/vc4: fix infinite EPROBE_DEFER loop")
from the drm-misc-fixes tree and commit:
d9f9bae6752f ("drm/bridge: allow limiting I2S formats")
from the drm-misc tree.
I fixed it up (the former removes code updated by the latter, so I just
removed the code) 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 --]
next reply other threads:[~2025-06-11 2:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 2:08 Stephen Rothwell [this message]
2025-06-11 2:22 ` linux-next: manual merge of the drm-misc tree with the drm-misc-fixes tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-04-09 0:46 Stephen Rothwell
2024-10-03 1:04 Stephen Rothwell
2024-08-01 1:18 Stephen Rothwell
2023-01-27 2:28 Stephen Rothwell
2022-11-15 23:47 Stephen Rothwell
2022-11-16 0:25 ` Stephen Rothwell
2022-11-16 12:13 ` Christian König
2022-04-13 23:47 Stephen Rothwell
2022-04-14 6:33 ` Christian König
2022-04-26 1:48 ` Stephen Rothwell
2020-10-29 1:18 Stephen Rothwell
2020-04-21 1:52 Stephen Rothwell
2020-04-21 6:10 ` Tomi Valkeinen
2020-04-23 3:17 ` Stephen Rothwell
2020-05-15 11:32 ` Tomi Valkeinen
2017-07-18 1:39 Stephen Rothwell
2017-07-21 0:03 ` Stephen Rothwell
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=20250611120801.48566070@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.baryshkov@linaro$(echo .)org \
--cc=dmitry.baryshkov@oss$(echo .)qualcomm.com \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=gabriel.dalimonte@gmail$(echo .)com \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mripard@kernel$(echo .)org \
--cc=simona.vetter@ffwll$(echo .)ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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